From aa324f46fdb143a4827ae7889d17559735edfc94 Mon Sep 17 00:00:00 2001
From: Krzysztof Helt <krzysztof.h1@wp.pl>
Date: Thu, 5 Jun 2008 22:46:33 -0700
Subject: [PATCH] --- yaml --- r: 97810 b: refs/heads/master c:
 10732c35dff6c2e15e413e7806a7114a2faa0ecf h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/video/console/fbcon.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 50cf533786ba..f9ddbea1cab8 100644
--- 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
index 5fa8b76673cb..97aff8db10bf 100644
--- 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;