diff --git a/[refs] b/[refs] index ac8e66000799..976aed94302a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b3cbe4094e3eddc9f38b34118c10aeea845eaf2 +refs/heads/master: f787f32e67e00b072f46b2ae3c454d2c0a1fcdb7 diff --git a/trunk/drivers/video/i810/i810_main.c b/trunk/drivers/video/i810/i810_main.c index 5a4ac3c85331..b83f36190cae 100644 --- a/trunk/drivers/video/i810/i810_main.c +++ b/trunk/drivers/video/i810/i810_main.c @@ -135,8 +135,8 @@ static struct pci_driver i810fb_driver = { static char *mode_option __devinitdata = NULL; static int vram __devinitdata = 4; static int bpp __devinitdata = 8; -static int mtrr __devinitdata; -static int accel __devinitdata; +static bool mtrr __devinitdata; +static bool accel __devinitdata; static int hsync1 __devinitdata; static int hsync2 __devinitdata; static int vsync1 __devinitdata; @@ -144,9 +144,9 @@ static int vsync2 __devinitdata; static int xres __devinitdata; static int yres; static int vyres __devinitdata; -static int sync __devinitdata; -static int extvga __devinitdata; -static int dcolor __devinitdata; +static bool sync __devinitdata; +static bool extvga __devinitdata; +static bool dcolor __devinitdata; static bool ddc3 __devinitdata; /*------------------------------------------------------------*/