The patch titled
pm2fb: change option mode to mode_option
has been added to the -mm tree. Its filename is
pm2fb-change-option-mode-to-mode_option.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: pm2fb: change option mode to mode_option
From: Krzysztof Helt <[EMAIL PROTECTED]>
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 <[EMAIL PROTECTED]>
Cc: Alain Kalker <[EMAIL PROTECTED]>
Cc: "Antonino A. Daplas" <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/video/pm2fb.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff -puN drivers/video/pm2fb.c~pm2fb-change-option-mode-to-mode_option
drivers/video/pm2fb.c
--- a/drivers/video/pm2fb.c~pm2fb-change-option-mode-to-mode_option
+++ a/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
info->pixmap.scan_align = 1;
}
- if (!mode)
- mode = "[EMAIL PROTECTED]";
+ if (!mode_option)
+ mode_option = "[EMAIL PROTECTED]";
- 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;
@@ -1797,7 +1797,7 @@ static int __init pm2fb_setup(char *opti
else if (!strncmp(this_opt, "noaccel", 7))
noaccel = 1;
else
- mode = this_opt;
+ mode_option = this_opt;
}
return 0;
}
@@ -1833,8 +1833,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. '[EMAIL PROTECTED]'");
+module_param(mode_option, charp, 0);
+MODULE_PARM_DESC(mode_option, "Initial video mode e.g. '[EMAIL PROTECTED]'");
module_param(lowhsync, bool, 0);
MODULE_PARM_DESC(lowhsync, "Force horizontal sync low regardless of mode");
module_param(lowvsync, bool, 0);
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
pm2fb-change-option-mode-to-mode_option.patch
tridentfb-change-option-mode-to-mode_option.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
