From de8b08e72e2c5c8122b84ff5e6b88d59eece9314 Mon Sep 17 00:00:00 2001 From: Krzysztof Helt Date: Mon, 6 Jul 2009 21:11:24 +0200 Subject: [PATCH] --- yaml --- r: 154903 b: refs/heads/master c: cbad1cbb51d92c0b5c3f47ef9dbf125de81fae08 h: refs/heads/master i: 154901: 4e403ffa91b3c46962c14c60eb15c40423d5bae7 154899: 6f1278414584a777ceba56bbb0817ece8a590393 154895: 3aa02e9388821e149b36e3879797d44ae34af3ba v: v3 --- [refs] | 2 +- trunk/drivers/video/sis/sis_main.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c33522da48eb..4c64334f35b1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e4a718ff38d8539938ec3421935904c27e00c39 +refs/heads/master: cbad1cbb51d92c0b5c3f47ef9dbf125de81fae08 diff --git a/trunk/drivers/video/sis/sis_main.c b/trunk/drivers/video/sis/sis_main.c index fd33455389b8..4a067f0d0ceb 100644 --- a/trunk/drivers/video/sis/sis_main.c +++ b/trunk/drivers/video/sis/sis_main.c @@ -6367,7 +6367,6 @@ error_3: vfree(ivideo->bios_abase); sis_fb_info->fix = ivideo->sisfb_fix; sis_fb_info->screen_base = ivideo->video_vbase + ivideo->video_offset; sis_fb_info->fbops = &sisfb_ops; - sisfb_get_fix(&sis_fb_info->fix, -1, sis_fb_info); sis_fb_info->pseudo_palette = ivideo->pseudo_palette; fb_alloc_cmap(&sis_fb_info->cmap, 256 , 0);