diff --git a/[refs] b/[refs]
index 3c437b617f57..48e99c78e5e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1443e483e34d2ead97215bd8496b34b0d3fbc2c0
+refs/heads/master: fd2a4f1183d1e6802457d70cea067396236ed64b
diff --git a/trunk/include/asm-mips/vga.h b/trunk/include/asm-mips/vga.h
index ca5cec97e167..34755c0a6398 100644
--- a/trunk/include/asm-mips/vga.h
+++ b/trunk/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);