diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 13:55:28 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 13:55:28 +0100 |
| commit | 0c929238ca4baefe47f4034732db4c154f2329c6 (patch) | |
| tree | 2636079800fa045501982a70e1be0425c1b968c2 /drivers/video/riva/fbdev.c | |
| parent | video: pvr2fb: Fix up spurious section mismatch warnings. (diff) | |
| parent | sh: fix the sh_mmcif_plat_data in board-sh7757lcr (diff) | |
| download | linux-0c929238ca4baefe47f4034732db4c154f2329c6.tar.xz linux-0c929238ca4baefe47f4034732db4c154f2329c6.zip | |
Merge branch 'sh/platform-updates' into sh-latest
Diffstat (limited to 'drivers/video/riva/fbdev.c')
| -rw-r--r-- | drivers/video/riva/fbdev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c index d8ab7be4fd6b..2f58cf9c813b 100644 --- a/drivers/video/riva/fbdev.c +++ b/drivers/video/riva/fbdev.c @@ -207,9 +207,9 @@ MODULE_DEVICE_TABLE(pci, rivafb_pci_tbl); /* command line data, set in rivafb_setup() */ static int flatpanel __devinitdata = -1; /* Autodetect later */ static int forceCRTC __devinitdata = -1; -static int noaccel __devinitdata = 0; +static bool noaccel __devinitdata = 0; #ifdef CONFIG_MTRR -static int nomtrr __devinitdata = 0; +static bool nomtrr __devinitdata = 0; #endif #ifdef CONFIG_PMAC_BACKLIGHT static int backlight __devinitdata = 1; @@ -218,7 +218,7 @@ static int backlight __devinitdata = 0; #endif static char *mode_option __devinitdata = NULL; -static int strictmode = 0; +static bool strictmode = 0; static struct fb_fix_screeninfo __devinitdata rivafb_fix = { .type = FB_TYPE_PACKED_PIXELS, |