diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 05:24:43 -0400 |
| commit | 8bbd54d69e9c66adbf544e21d8dcfb15fb9198f7 (patch) | |
| tree | 95f30814fc759c2cb523dbea95bc531c7f8f3231 /drivers/video/console/fbcon.c | |
| parent | 8c2238eaaf0f774ca0f8d9daad7a616429bbb7f1 (diff) | |
| parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) | |
Merge branch 'linus' into core/softlockup
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 5fa8b76673cb..97aff8db10bf 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) | |||
| 2275 | * in fb_set_var() | 2275 | * in fb_set_var() |
| 2276 | */ | 2276 | */ |
| 2277 | info->var.activate = var.activate; | 2277 | info->var.activate = var.activate; |
| 2278 | var.yoffset = info->var.yoffset; | 2278 | var.vmode |= info->var.vmode & ~FB_VMODE_MASK; |
| 2279 | var.xoffset = info->var.xoffset; | ||
| 2280 | var.vmode = info->var.vmode; | ||
| 2281 | fb_set_var(info, &var); | 2279 | fb_set_var(info, &var); |
| 2282 | ops->var = info->var; | 2280 | ops->var = info->var; |
| 2283 | 2281 | ||