From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 8 Mar 2006 16:04:32 +0000 (+0000)
Subject: [MIPS] Undefine scr_writew and scr_readw in <asm/vga.h>.
X-Git-Tag: v2.6.16-rc6~47
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd2a4f1183d1e6802457d70cea067396236ed64b;p=linux-2.6

[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>
---

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