aboutsummaryrefslogtreecommitdiff
path: root/drivers/video
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2005-09-12 09:16:47 +0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-11 20:43:47 -0700
commit747a5054c0663a21c440524bdac1bca31be0d20e (patch)
tree7e42775896a052ec4fd14d62c4aeaaf7f24b7f07 /drivers/video
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')
-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 78feded4094..0dbc9ddb676 100644
--- a/drivers/video/i810/i810_main.c
+++ b/drivers/video/i810/i810_main.c
@@ -105,7 +105,7 @@ static int xres __devinitdata;
static int yres __devinitdata;
static int vyres __devinitdata;
static int sync __devinitdata;
-static int ext_vga __devinitdata;
+static int extvga __devinitdata;
static int dcolor __devinitdata;
/*------------------------------------------------------------*/
@@ -1766,7 +1766,7 @@ static void __devinit i810_init_device(struct i810fb_par *par)
i810_init_cursor(par);
/* mvo: enable external vga-connector (for laptops) */
- if (ext_vga) {
+ if (extvga) {
i810_writel(HVSYNC, mmio, 0);
i810_writel(PWR_CLKC, mmio, 3);
}
@@ -1921,8 +1921,8 @@ static int __devinit i810fb_setup(char *options)
mtrr = 1;
else if (!strncmp(this_opt, "accel", 5))
accel = 1;
- else if (!strncmp(this_opt, "ext_vga", 7))
- ext_vga = 1;
+ else if (!strncmp(this_opt, "extvga", 6))
+ extvga = 1;
else if (!strncmp(this_opt, "sync", 4))
sync = 1;
else if (!strncmp(this_opt, "vram:", 5))
@@ -2151,8 +2151,8 @@ module_param(accel, bool, 0);
MODULE_PARM_DESC(accel, "Use Acceleration (BLIT) engine (default = 0)");
module_param(mtrr, bool, 0);
MODULE_PARM_DESC(mtrr, "Use MTRR (default = 0)");
-module_param(ext_vga, bool, 0);
-MODULE_PARM_DESC(ext_vga, "Enable external VGA connector (default = 0)");
+module_param(extvga, bool, 0);
+MODULE_PARM_DESC(extvga, "Enable external VGA connector (default = 0)");
module_param(sync, bool, 0);
MODULE_PARM_DESC(sync, "wait for accel engine to finish drawing"
" (default = 0)");