aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/i810
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2005-09-11 21:16:47 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-11 23:43:47 -0400
commit747a5054c0663a21c440524bdac1bca31be0d20e (patch)
tree7e42775896a052ec4fd14d62c4aeaaf7f24b7f07 /drivers/video/i810
parent595e8a97f48619fe7952f31259d3e61af9118f49 (diff)
[PATCH] i810fb: Change option ext_vga to extvga to match documentation
Reported by: Manuel Lauss <mano@roarinelk.homelinux.net> He was getting random initial video modes depending on the kernel configuration. His option line includes 'extvga'. The i810fb documentation describes the option 'extvga', however the driver accepts 'ext_vga'. Besides 'extvga' being ignored by i810fb, it also confuses the option parser of i810fb and assigns 'extvga' to 'mode_option'. This leads to an incorrect video mode at boot time. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/i810')
-rw-r--r--drivers/video/i810/i810_main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c
index 78feded40945..0dbc9ddb6766 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -105,7 +105,7 @@ static int xres __devinitdata;
105static int yres __devinitdata; 105static int yres __devinitdata;
106static int vyres __devinitdata; 106static int vyres __devinitdata;
107static int sync __devinitdata; 107static int sync __devinitdata;
108static int ext_vga __devinitdata; 108static int extvga __devinitdata;
109static int dcolor __devinitdata; 109static int dcolor __devinitdata;
110 110
111/*------------------------------------------------------------*/ 111/*------------------------------------------------------------*/
@@ -1766,7 +1766,7 @@ static void __devinit i810_init_device(struct i810fb_par *par)
1766 i810_init_cursor(par); 1766 i810_init_cursor(par);
1767 1767
1768 /* mvo: enable external vga-connector (for laptops) */ 1768 /* mvo: enable external vga-connector (for laptops) */
1769 if (ext_vga) { 1769 if (extvga) {
1770 i810_writel(HVSYNC, mmio, 0); 1770 i810_writel(HVSYNC, mmio, 0);
1771 i810_writel(PWR_CLKC, mmio, 3); 1771 i810_writel(PWR_CLKC, mmio, 3);
1772 } 1772 }
@@ -1921,8 +1921,8 @@ static int __devinit i810fb_setup(char *options)
1921 mtrr = 1; 1921 mtrr = 1;
1922 else if (!strncmp(this_opt, "accel", 5)) 1922 else if (!strncmp(this_opt, "accel", 5))
1923 accel = 1; 1923 accel = 1;
1924 else if (!strncmp(this_opt, "ext_vga", 7)) 1924 else if (!strncmp(this_opt, "extvga", 6))
1925 ext_vga = 1; 1925 extvga = 1;
1926 else if (!strncmp(this_opt, "sync", 4)) 1926 else if (!strncmp(this_opt, "sync", 4))
1927 sync = 1; 1927 sync = 1;
1928 else if (!strncmp(this_opt, "vram:", 5)) 1928 else if (!strncmp(this_opt, "vram:", 5))
@@ -2151,8 +2151,8 @@ module_param(accel, bool, 0);
2151MODULE_PARM_DESC(accel, "Use Acceleration (BLIT) engine (default = 0)"); 2151MODULE_PARM_DESC(accel, "Use Acceleration (BLIT) engine (default = 0)");
2152module_param(mtrr, bool, 0); 2152module_param(mtrr, bool, 0);
2153MODULE_PARM_DESC(mtrr, "Use MTRR (default = 0)"); 2153MODULE_PARM_DESC(mtrr, "Use MTRR (default = 0)");
2154module_param(ext_vga, bool, 0); 2154module_param(extvga, bool, 0);
2155MODULE_PARM_DESC(ext_vga, "Enable external VGA connector (default = 0)"); 2155MODULE_PARM_DESC(extvga, "Enable external VGA connector (default = 0)");
2156module_param(sync, bool, 0); 2156module_param(sync, bool, 0);
2157MODULE_PARM_DESC(sync, "wait for accel engine to finish drawing" 2157MODULE_PARM_DESC(sync, "wait for accel engine to finish drawing"
2158 " (default = 0)"); 2158 " (default = 0)");