commit fd2a4f1183d1e6802457d70cea067396236ed64b
author Ralf Baechle <ralf@linux-mips.org> Wed Mar 08 16:04:32 2006 +0000
committer Ralf Baechle <ralf@linux-mips.org> Thu Mar 09 18:05:10 2006 +0000
tree 144fa623d9935bd67c63b71078eb35d1109d7dfb
parent 1443e483e34d2ead97215bd8496b34b0d3fbc2c0

[MIPS] Undefine scr_writew and scr_readw in <asm/vga.h>.
    
This is gluing the build of cirrusfb but really the mess that would need
cleaning and fixing is <video/vga.h> and <linux/vt_buffer.h> ...
    
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

include/asm-mips/vga.h

diff --git a/include/asm-mips/vga.h b/include/asm-mips/vga.h
index ca5cec9..34755c0 100644
--- a/include/asm-mips/vga.h
+++ b/include/asm-mips/vga.h
@@ -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);