---

yaml --- r: 97810 b: refs/heads/master c: 10732c3 h: refs/heads/master v: v3
git-mirror · Jun 6, 2008 · aa324f4 · aa324f4
1 parent 973508f
commit aa324f4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dba6a4d32d8677c99e73798d3375417f8a6d46de
+refs/heads/master: 10732c35dff6c2e15e413e7806a7114a2faa0ecf
diff --git a/trunk/drivers/video/console/fbcon.c b/trunk/drivers/video/console/fbcon.c
@@ -2275,9 +2275,7 @@ static int fbcon_switch(struct vc_data *vc)
 	 * in fb_set_var()
 	 */
 	info->var.activate = var.activate;
-	var.yoffset = info->var.yoffset;
-	var.xoffset = info->var.xoffset;
-	var.vmode = info->var.vmode;
+	var.vmode |= info->var.vmode & ~FB_VMODE_MASK;
 	fb_set_var(info, &var);
 	ops->var = info->var;