Commit 4a40d604 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] vga16fb-fix

The recent ARM-specific fix broke ia32.  Hopefully the ARM team can find an
arch-specific implementation of VGA_MAP_MEM() which makes it work.
parent 227d8064
...@@ -1347,7 +1347,7 @@ int __init vga16fb_init(void) ...@@ -1347,7 +1347,7 @@ int __init vga16fb_init(void)
/* XXX share VGA_FB_PHYS and I/O region with vgacon and others */ /* 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 = VGA_MAP_MEM(VGA_FB_PHYS);
if (!vga16fb.screen_base) { if (!vga16fb.screen_base) {
printk(KERN_ERR "vga16fb: unable to map device\n"); printk(KERN_ERR "vga16fb: unable to map device\n");
ret = -ENOMEM; ret = -ENOMEM;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment