From 3b6b15a287d011fa208c3f6e78f244f86170504c Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Tue, 7 Jul 2009 22:06:48 +0200 Subject: [PATCH] --- yaml --- r: 155053 b: refs/heads/master c: d7272e5bd9ead4389849db9749b8c4dabd459dd1 h: refs/heads/master i: 155051: 550560a2c0d3b8c2474e81cf84abf97f4b02edbd v: v3 --- [refs] | 2 +- trunk/drivers/video/matrox/matroxfb_base.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1884917a0d9b..18d08d1be8c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1b9c339bf30c90114b7c8f285d25e67c7080f90 +refs/heads/master: d7272e5bd9ead4389849db9749b8c4dabd459dd1 diff --git a/trunk/drivers/video/matrox/matroxfb_base.c b/trunk/drivers/video/matrox/matroxfb_base.c index 76bc51b616d1..721a87dc8cfc 100644 --- a/trunk/drivers/video/matrox/matroxfb_base.c +++ b/trunk/drivers/video/matrox/matroxfb_base.c @@ -1876,7 +1876,6 @@ static int initMatrox2(WPMINFO struct board* b){ } matroxfb_init_fix(PMINFO2); ACCESS_FBINFO(fbcon.screen_base) = vaddr_va(ACCESS_FBINFO(video.vbase)); - matroxfb_update_fix(PMINFO2); /* Normalize values (namely yres_virtual) */ matroxfb_check_var(&vesafb_defined, &ACCESS_FBINFO(fbcon)); /* And put it into "current" var. Do NOT program hardware yet, or we'll not take over