fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/include/asm-sparc64/vga.h b/include/asm-sparc64/vga.h
index c2f5529..c69d5b2 100644 (file)
--- a/include/asm-sparc64/vga.h
+++ b/include/asm-sparc64/vga.h
@@ -11,6 +11,9 @@
 
 #define VT_BUF_HAVE_RW
 
+#undef scr_writew
+#undef scr_readw
+
 static inline void scr_writew(u16 val, u16 *addr)
 {
        BUG_ON((long) addr >= 0);
@@ -25,6 +28,6 @@ static inline u16 scr_readw(const u16 *addr)
        return *addr;
 }
 
-#define VGA_MAP_MEM(x) (x)
+#define VGA_MAP_MEM(x,s) (x)
 
 #endif