patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / video / vga16fb.c

diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c
index 577355d..bdcc8ec 100644 (file)
--- a/drivers/video/vga16fb.c
+++ b/drivers/video/vga16fb.c
@@ -1347,7 +1347,7 @@ int __init vga16fb_init(void)
 
        /* XXX share VGA_FB_PHYS and I/O region with vgacon and others */
 
-       vga16fb.screen_base = ioremap(VGA_MAP_MEM(VGA_FB_PHYS), VGA_FB_PHYS_LEN);
+       vga16fb.screen_base = (void *)VGA_MAP_MEM(VGA_FB_PHYS);
        if (!vga16fb.screen_base) {
                printk(KERN_ERR "vga16fb: unable to map device\n");
                ret = -ENOMEM;
@@ -1372,8 +1372,6 @@ int __init vga16fb_init(void)
        vga16fb.par = &vga16_par;
        vga16fb.flags = FBINFO_FLAG_DEFAULT;
 
-       vga16fb.fix.smem_start  = VGA_MAP_MEM(vga16fb.fix.smem_start);
-
        i = (vga16fb_defined.bits_per_pixel == 8) ? 256 : 16;
        ret = fb_alloc_cmap(&vga16fb.cmap, i, 0);
        if (ret) {