Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2428e59b authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Linus Torvalds
Browse files

fbcon: fix sparse warning about shadowing 'rotate' symbol 



Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2c6cc35c

drivers/video/console/fbcon.c

+6 −6
Original line number Diff line number Diff line
@@ -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;