aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2008-04-28 05:15:05 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-28 11:58:37 -0400
commit5eb81e808de6f49af1dd74db68876a79da1314a5 (patch)
treef276fc92076dafe8f5c00766dca9545274befe7c
parent21b4d1db84a70175251d86078123cc27e46ff69d (diff)
pm2fb: change option mode to mode_option
Change the option "mode_option" into "mode". This is one step toward changing all fb drivers to have common "mode_option" parameter. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: Alain Kalker <miki@dds.nl> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/pm2fb.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c
index 82aa8242f441..a52c61a0ce52 100644
--- a/drivers/video/pm2fb.c
+++ b/drivers/video/pm2fb.c
@@ -67,7 +67,7 @@
67 * Driver data 67 * Driver data
68 */ 68 */
69static int hwcursor = 1; 69static int hwcursor = 1;
70static char *mode __devinitdata; 70static char *mode_option __devinitdata;
71 71
72/* 72/*
73 * The XFree GLINT driver will (I think to implement hardware cursor 73 * The XFree GLINT driver will (I think to implement hardware cursor
@@ -1680,10 +1680,10 @@ static int __devinit pm2fb_probe(struct pci_dev *pdev,
1680 info->pixmap.scan_align = 1; 1680 info->pixmap.scan_align = 1;
1681 } 1681 }
1682 1682
1683 if (!mode) 1683 if (!mode_option)
1684 mode = "640x480@60"; 1684 mode_option = "640x480@60";
1685 1685
1686 err = fb_find_mode(&info->var, info, mode, NULL, 0, NULL, 8); 1686 err = fb_find_mode(&info->var, info, mode_option, NULL, 0, NULL, 8);
1687 if (!err || err == 4) 1687 if (!err || err == 4)
1688 info->var = pm2fb_var; 1688 info->var = pm2fb_var;
1689 1689
@@ -1799,7 +1799,7 @@ static int __init pm2fb_setup(char *options)
1799 else if (!strncmp(this_opt, "noaccel", 7)) 1799 else if (!strncmp(this_opt, "noaccel", 7))
1800 noaccel = 1; 1800 noaccel = 1;
1801 else 1801 else
1802 mode = this_opt; 1802 mode_option = this_opt;
1803 } 1803 }
1804 return 0; 1804 return 0;
1805} 1805}
@@ -1835,8 +1835,8 @@ static void __exit pm2fb_exit(void)
1835#ifdef MODULE 1835#ifdef MODULE
1836module_exit(pm2fb_exit); 1836module_exit(pm2fb_exit);
1837 1837
1838module_param(mode, charp, 0); 1838module_param(mode_option, charp, 0);
1839MODULE_PARM_DESC(mode, "Preferred video mode e.g. '648x480-8@60'"); 1839MODULE_PARM_DESC(mode_option, "Initial video mode e.g. '648x480-8@60'");
1840module_param(lowhsync, bool, 0); 1840module_param(lowhsync, bool, 0);
1841MODULE_PARM_DESC(lowhsync, "Force horizontal sync low regardless of mode"); 1841MODULE_PARM_DESC(lowhsync, "Force horizontal sync low regardless of mode");
1842module_param(lowvsync, bool, 0); 1842module_param(lowvsync, bool, 0);