aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/vt8623fb.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/vt8623fb.c')
-rw-r--r--drivers/video/vt8623fb.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 4c3a63308df1..66305b604ba8 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -100,7 +100,7 @@ static struct svga_timing_regs vt8623_timing_regs = {
100 100
101/* Module parameters */ 101/* Module parameters */
102 102
103static char *mode = "640x480-8@60"; 103static char *mode_option = "640x480-8@60";
104 104
105#ifdef CONFIG_MTRR 105#ifdef CONFIG_MTRR
106static int mtrr = 1; 106static int mtrr = 1;
@@ -110,8 +110,8 @@ MODULE_AUTHOR("(c) 2006 Ondrej Zajicek <santiago@crfreenet.org>");
110MODULE_LICENSE("GPL"); 110MODULE_LICENSE("GPL");
111MODULE_DESCRIPTION("fbdev driver for integrated graphics core in VIA VT8623 [CLE266]"); 111MODULE_DESCRIPTION("fbdev driver for integrated graphics core in VIA VT8623 [CLE266]");
112 112
113module_param(mode, charp, 0644); 113module_param(mode_option, charp, 0644);
114MODULE_PARM_DESC(mode, "Default video mode ('640x480-8@60', etc)"); 114MODULE_PARM_DESC(mode_option, "Default video mode ('640x480-8@60', etc)");
115 115
116#ifdef CONFIG_MTRR 116#ifdef CONFIG_MTRR
117module_param(mtrr, int, 0444); 117module_param(mtrr, int, 0444);
@@ -722,10 +722,10 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
722 722
723 /* Prepare startup mode */ 723 /* Prepare startup mode */
724 724
725 rc = fb_find_mode(&(info->var), info, mode, NULL, 0, NULL, 8); 725 rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);
726 if (! ((rc == 1) || (rc == 2))) { 726 if (! ((rc == 1) || (rc == 2))) {
727 rc = -EINVAL; 727 rc = -EINVAL;
728 dev_err(&(dev->dev), "mode %s not found\n", mode); 728 dev_err(&(dev->dev), "mode %s not found\n", mode_option);
729 goto err_find_mode; 729 goto err_find_mode;
730 } 730 }
731 731
@@ -913,7 +913,7 @@ static int __init vt8623fb_init(void)
913 return -ENODEV; 913 return -ENODEV;
914 914
915 if (option && *option) 915 if (option && *option)
916 mode = option; 916 mode_option = option;
917#endif 917#endif
918 918
919 pr_debug("vt8623fb: initializing\n"); 919 pr_debug("vt8623fb: initializing\n");