The patch titled
fbcon: fix sparse warning about shadowing 'rotate' symbol
has been added to the -mm tree. Its filename is
fbcon-fix-sparse-warning-about-shadowing-rotate-symbol.patch
*** 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
------------------------------------------------------
Subject: fbcon: fix sparse warning about shadowing 'rotate' symbol
From: Marcin Slusarz <[EMAIL PROTECTED]>
Signed-off-by: Marcin Slusarz <[EMAIL PROTECTED]>
Cc: "Antonino A. Daplas" <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/video/console/fbcon.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff -puN
drivers/video/console/fbcon.c~fbcon-fix-sparse-warning-about-shadowing-rotate-symbol
drivers/video/console/fbcon.c
---
a/drivers/video/console/fbcon.c~fbcon-fix-sparse-warning-about-shadowing-rotate-symbol
+++ a/drivers/video/console/fbcon.c
@@ -147,7 +147,7 @@ static char fontname[40];
static int info_idx = -1;
/* console rotation */
-static int rotate;
+static int initial_rotation;
static int fbcon_has_sysfs;
static const struct consw fb_con;
@@ -537,9 +537,9 @@ static int __init fb_console_setup(char
if (!strncmp(options, "rotate:", 7)) {
options += 7;
if (*options)
- rotate = simple_strtoul(options, &options, 0);
- if (rotate > 3)
- rotate = 0;
+ initial_rotation = simple_strtoul(options,
&options, 0);
+ if (initial_rotation > 3)
+ initial_rotation = 0;
}
}
return 1;
@@ -989,7 +989,7 @@ static const char *fbcon_startup(void)
ops->graphics = 1;
ops->cur_rotate = -1;
info->fbcon_par = ops;
- p->con_rotate = rotate;
+ p->con_rotate = initial_rotation;
set_blitting_type(vc, info);
if (info->fix.type != FB_TYPE_TEXT) {
@@ -1176,7 +1176,7 @@ static void fbcon_init(struct vc_data *v
con_copy_unimap(vc, svc);
ops = info->fbcon_par;
- p->con_rotate = rotate;
+ p->con_rotate = initial_rotation;
set_blitting_type(vc, info);
cols = vc->vc_cols;
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
vgacon-fix-sparse-warning-about-shadowing-i-symbol.patch
fbcon-fix-sparse-warning-about-shadowing-p-symbol.patch
fbcon-fix-sparse-warning-about-shadowing-rotate-symbol.patch
logo-move-declarations-of-logos-to-linux_logoh.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
