diff options
| author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2008-04-28 02:15:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-28 08:58:37 -0700 |
| commit | 5eb81e808de6f49af1dd74db68876a79da1314a5 (patch) | |
| tree | f276fc92076dafe8f5c00766dca9545274befe7c | |
| parent | 21b4d1db84a70175251d86078123cc27e46ff69d (diff) | |
| download | linux-3.10-5eb81e808de6f49af1dd74db68876a79da1314a5.tar.gz linux-3.10-5eb81e808de6f49af1dd74db68876a79da1314a5.tar.bz2 linux-3.10-5eb81e808de6f49af1dd74db68876a79da1314a5.zip | |
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.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/pm2fb.c b/drivers/video/pm2fb.c index 82aa8242f44..a52c61a0ce5 100644 --- a/drivers/video/pm2fb.c +++ b/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); |