aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/console/fbcon.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 23108affd12e..c6babb178c77 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -147,7 +147,7 @@ static char fontname[40];
147static int info_idx = -1; 147static int info_idx = -1;
148 148
149/* console rotation */ 149/* console rotation */
150static int rotate; 150static int initial_rotation;
151static int fbcon_has_sysfs; 151static int fbcon_has_sysfs;
152 152
153static const struct consw fb_con; 153static const struct consw fb_con;
@@ -537,9 +537,9 @@ static int __init fb_console_setup(char *this_opt)
537 if (!strncmp(options, "rotate:", 7)) { 537 if (!strncmp(options, "rotate:", 7)) {
538 options += 7; 538 options += 7;
539 if (*options) 539 if (*options)
540 rotate = simple_strtoul(options, &options, 0); 540 initial_rotation = simple_strtoul(options, &options, 0);
541 if (rotate > 3) 541 if (initial_rotation > 3)
542 rotate = 0; 542 initial_rotation = 0;
543 } 543 }
544 } 544 }
545 return 1; 545 return 1;
@@ -989,7 +989,7 @@ static const char *fbcon_startup(void)
989 ops->graphics = 1; 989 ops->graphics = 1;
990 ops->cur_rotate = -1; 990 ops->cur_rotate = -1;
991 info->fbcon_par = ops; 991 info->fbcon_par = ops;
992 p->con_rotate = rotate; 992 p->con_rotate = initial_rotation;
993 set_blitting_type(vc, info); 993 set_blitting_type(vc, info);
994 994
995 if (info->fix.type != FB_TYPE_TEXT) { 995 if (info->fix.type != FB_TYPE_TEXT) {
@@ -1176,7 +1176,7 @@ static void fbcon_init(struct vc_data *vc, int init)
1176 con_copy_unimap(vc, svc); 1176 con_copy_unimap(vc, svc);
1177 1177
1178 ops = info->fbcon_par; 1178 ops = info->fbcon_par;
1179 p->con_rotate = rotate; 1179 p->con_rotate = initial_rotation;
1180 set_blitting_type(vc, info); 1180 set_blitting_type(vc, info);
1181 1181
1182 cols = vc->vc_cols; 1182 cols = vc->vc_cols;