linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-powerpc / vga.h

diff --git a/include/asm-powerpc/vga.h b/include/asm-powerpc/vga.h
index a2eac40..f8d350a 100644 (file)
--- a/include/asm-powerpc/vga.h
+++ b/include/asm-powerpc/vga.h
@@ -12,6 +12,7 @@
 
 #include <asm/io.h>
 
+#include <linux/config.h>
 
 #if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_MDA_CONSOLE)
 
@@ -41,9 +42,9 @@ static inline u16 scr_readw(volatile const u16 *addr)
 extern unsigned long vgacon_remap_base;
 
 #ifdef __powerpc64__
-#define VGA_MAP_MEM(x,s) ((unsigned long) ioremap((x), s))
+#define VGA_MAP_MEM(x) ((unsigned long) ioremap((x), 0))
 #else
-#define VGA_MAP_MEM(x,s) (x + vgacon_remap_base)
+#define VGA_MAP_MEM(x) (x + vgacon_remap_base)
 #endif
 
 #define vga_readb(x) (*(x))