X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fasm-mips%2Fvga.h;h=f4cff7e4fa8a2a531a80e2374eb4056c46dab7aa;hb=b6257a9036f06878a0f02354d5a07f155e1cfee0;hp=ca5cec97e16711a02b5800d18b88fd4b94020b4f;hpb=127f2fa31ac624c744f3767363c4919209980956;p=linux-2.6

diff --git a/include/asm-mips/vga.h b/include/asm-mips/vga.h
index ca5cec97e1..f4cff7e4fa 100644
--- 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);