leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fbcon: fix sparse warning about shadowing 'rotate' symbol

Browse Source 
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
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>
This commit is contained in:
Marcin Slusarz 2008-02-06 01:39:14 -08:00 committed by Linus Torvalds
parent 2c6cc35c30
commit 2428e59b53
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/video/console/fbcon.c
View File

@ -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 *this_opt)
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 *vc, int init)
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;