From 8b0631365788b0ee1d04b1c872e3452017112fb7 Mon Sep 17 00:00:00 2001
From: Krzysztof Helt <krzysztof.h1@wp.pl>
Date: Mon, 28 Apr 2008 02:15:05 -0700
Subject: [PATCH] --- yaml --- r: 94155 b: refs/heads/master c:
 5eb81e808de6f49af1dd74db68876a79da1314a5 h: refs/heads/master i:   94153:
 9cc06f43e2a50c4d9b41bccb140682fd0670861e   94151:
 7870dbb2a5fbb7fe00fc07df50e0628da662991c v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/video/pm2fb.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index a35ed18b128e..8edbaee0fe56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21b4d1db84a70175251d86078123cc27e46ff69d
+refs/heads/master: 5eb81e808de6f49af1dd74db68876a79da1314a5
diff --git a/trunk/drivers/video/pm2fb.c b/trunk/drivers/video/pm2fb.c
index 82aa8242f441..a52c61a0ce52 100644
--- a/trunk/drivers/video/pm2fb.c
+++ b/trunk/drivers/video/pm2fb.c
@@ -67,7 +67,7 @@
  * Driver data
  */
 static int hwcursor = 1;
-static char *mode __devinitdata;
+static char *mode_option __devinitdata;
 
 /*
  * The XFree GLINT driver will (I think to implement hardware cursor
@@ -1680,10 +1680,10 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
 		info->pixmap.scan_align = 1;
 	}
 
-	if (!mode)
-		mode = "640x480@60";
+	if (!mode_option)
+		mode_option = "640x480@60";
 
-	err = fb_find_mode(&info->var, info, mode, NULL, 0, NULL, 8);
+	err = fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 8);
 	if (!err || err == 4)
 		info->var = pm2fb_var;
 
@@ -1799,7 +1799,7 @@ static int __init pm2fb_setup(char *options)
 		else if (!strncmp(this_opt, "noaccel", 7))
 			noaccel = 1;
 		else
-			mode = this_opt;
+			mode_option = this_opt;
 	}
 	return 0;
 }
@@ -1835,8 +1835,8 @@ static void __exit pm2fb_exit(void)
 #ifdef MODULE
 module_exit(pm2fb_exit);
 
-module_param(mode, charp, 0);
-MODULE_PARM_DESC(mode, "Preferred video mode e.g. '648x480-8@60'");
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "Initial video mode e.g. '648x480-8@60'");
 module_param(lowhsync, bool, 0);
 MODULE_PARM_DESC(lowhsync, "Force horizontal sync low regardless of mode");
 module_param(lowvsync, bool, 0);