Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubifs-2.6

[pandora-kernel.git] / include / asm-mips / vga.h

diff --git a/include/asm-mips/vga.h b/include/asm-mips/vga.h
index ca5cec9..f4cff7e 100644 (file)
--- a/include/asm-mips/vga.h
+++ b/include/asm-mips/vga.h
@@ -13,10 +13,10 @@
  *     access the videoram directly without any black magic.
  */
 
-#define VGA_MAP_MEM(x) (0xb0000000L + (unsigned long)(x))
+#define VGA_MAP_MEM(x, s)      (0xb0000000L + (unsigned long)(x))
 
 #define vga_readb(x)   (*(x))
-#define vga_writeb(x,y)        (*(y) = (x))
+#define vga_writeb(x, y)       (*(y) = (x))
 
 #define VT_BUF_HAVE_RW
 /*
@@ -26,6 +26,9 @@
  *  <linux/vt_buffer.h> has already done the right job for us.
  */
 
+#undef scr_writew
+#undef scr_readw
+
 static inline void scr_writew(u16 val, volatile u16 *addr)
 {
        *addr = cpu_to_le16(val);