From: Krzysztof Helt <krzysztof.h1@wp.pl>

Fix http://bugzilla.kernel.org/show_bug.cgi?id=9847

   While all other framebuffer modules use the option "mode=..." to specify
   a modedb-style video mode, i810fb uses the non-standard "mode_option=..."
   This breaks the use of "video=i810fb:<videomode>" boot parameter, such that
   for instance "video=i810fb:1024x768" doesn't work.  The boot scripts parse
   the "<videomode>" parameter internally and pass it to the correct module as
   'mode=<videomode>'.

This patch changes the option "mode_option" into "mode".

Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Reported-by: <miki@dds.nl>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/video/i810/i810_main.c |   24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff -puN drivers/video/i810/i810_main.c~i810fb-module-parameter-mode_option-inconsistent-with-other-framebuffer-modules drivers/video/i810/i810_main.c
--- a/drivers/video/i810/i810_main.c~i810fb-module-parameter-mode_option-inconsistent-with-other-framebuffer-modules
+++ a/drivers/video/i810/i810_main.c
@@ -132,7 +132,7 @@ static struct pci_driver i810fb_driver =
 	.resume   =     i810fb_resume,
 };
 
-static char *mode_option __devinitdata = NULL;
+static char *mode     __devinitdata;
 static int vram       __devinitdata = 4;
 static int bpp        __devinitdata = 8;
 static int mtrr       __devinitdata;
@@ -1891,7 +1891,7 @@ i810_allocate_pci_resource(struct i810fb
 
 static void __devinit i810fb_find_init_mode(struct fb_info *info)
 {
-	struct fb_videomode mode;
+	struct fb_videomode mode_new;
 	struct fb_var_screeninfo var;
 	struct fb_monspecs *specs = &info->monspecs;
 	int found = 0;
@@ -1902,7 +1902,7 @@ static void __devinit i810fb_find_init_m
 #endif
 
 	INIT_LIST_HEAD(&info->modelist);
-	memset(&mode, 0, sizeof(struct fb_videomode));
+	memset(&mode_new, 0, sizeof(struct fb_videomode));
 	var = info->var;
 #ifdef CONFIG_FB_I810_I2C
 	i810_create_i2c_busses(par);
@@ -1928,23 +1928,23 @@ static void __devinit i810fb_find_init_m
 
 		if (xres && yres) {
 			if ((m = fb_find_best_mode(&var, &info->modelist))) {
-				mode = *m;
+				mode_new = *m;
 				found  = 1;
 			}
 		}
 
 		if (!found) {
 			m = fb_find_best_display(&info->monspecs, &info->modelist);
-			mode = *m;
+			mode_new = *m;
 			found = 1;
 		}
 
-		fb_videomode_to_var(&var, &mode);
+		fb_videomode_to_var(&var, &mode_new);
 	}
 #endif
-	if (mode_option)
-		fb_find_mode(&var, info, mode_option, specs->modedb,
-			     specs->modedb_len, (found) ? &mode : NULL,
+	if (mode)
+		fb_find_mode(&var, info, mode, specs->modedb,
+			     specs->modedb_len, (found) ? &mode_new : NULL,
 			     info->var.bits_per_pixel);
 
 	info->var = var;
@@ -1998,7 +1998,7 @@ static int __devinit i810fb_setup(char *
 		else if (!strncmp(this_opt, "ddc3", 4))
 			ddc3 = 3;
 		else
-			mode_option = this_opt;
+			mode = this_opt;
 	}
 	return 0;
 }
@@ -2202,8 +2202,8 @@ MODULE_PARM_DESC(dcolor, "use DirectColo
 		 " (default = 0 = TrueColor)");
 module_param(ddc3, bool, 0);
 MODULE_PARM_DESC(ddc3, "Probe DDC bus 3 (default = 0 = no)");
-module_param(mode_option, charp, 0);
-MODULE_PARM_DESC(mode_option, "Specify initial video mode");
+module_param(mode, charp, 0);
+MODULE_PARM_DESC(mode, "Specify initial video mode");
 
 MODULE_AUTHOR("Tony A. Daplas");
 MODULE_DESCRIPTION("Framebuffer device for the Intel 810/815 and"
_