diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:24:17 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:24:17 +0200 |
| commit | 9583f3d9c00974911daf227cbaa12d6c1caaabad (patch) | |
| tree | f37466204ecbfea37c7d567fd06c9bece0cc663d /drivers/video/console/fbcon.c | |
| parent | 962cf36c5bf6d2840b8d66ee9a606fae2f540bbd (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
| download | op-kernel-dev-9583f3d9c00974911daf227cbaa12d6c1caaabad.zip op-kernel-dev-9583f3d9c00974911daf227cbaa12d6c1caaabad.tar.gz | |
Merge branch 'linus' into core/softirq
Diffstat (limited to 'drivers/video/console/fbcon.c')
| -rw-r--r-- | drivers/video/console/fbcon.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 5fa8b76..97aff8d 100644 --- a/drivers/video/console/fbcon.c +++ b/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; |
