From b47f9b8176954a9d21db4b8c4ba7eca54ad90088 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 15 Dec 2011 13:33:56 +1030 Subject: [PATCH] --- yaml --- r: 284865 b: refs/heads/master c: 109782ec8d2e1886f80be90a295361c1a86a51df h: refs/heads/master i: 284863: 63e0fb1921621d19bd3d324e2b5dfe1ca0146469 v: v3 --- [refs] | 2 +- trunk/drivers/video/i810/i810_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5486035676f8..19879f8c482c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 00f1f199eaab5589aed653dec953dd57d6c9bcda +refs/heads/master: 109782ec8d2e1886f80be90a295361c1a86a51df diff --git a/trunk/drivers/video/i810/i810_main.c b/trunk/drivers/video/i810/i810_main.c index 318f6fb895b2..5a4ac3c85331 100644 --- a/trunk/drivers/video/i810/i810_main.c +++ b/trunk/drivers/video/i810/i810_main.c @@ -147,7 +147,7 @@ static int vyres __devinitdata; static int sync __devinitdata; static int extvga __devinitdata; static int dcolor __devinitdata; -static int ddc3 __devinitdata = 2; +static bool ddc3 __devinitdata; /*------------------------------------------------------------*/ @@ -1776,7 +1776,7 @@ static void __devinit i810_init_defaults(struct i810fb_par *par, if (sync) par->dev_flags |= ALWAYS_SYNC; - par->ddc_num = ddc3; + par->ddc_num = (ddc3 ? 3 : 2); if (bpp < 8) bpp = 8; @@ -1999,7 +1999,7 @@ static int __devinit i810fb_setup(char *options) else if (!strncmp(this_opt, "dcolor", 6)) dcolor = 1; else if (!strncmp(this_opt, "ddc3", 4)) - ddc3 = 3; + ddc3 = true; else mode_option = this_opt; }