diff --git a/[refs] b/[refs]
index ca06a2e94157..96f40249ceb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6d7c7a91138c883f890c204cd5300172145b0b3
+refs/heads/master: e32b699335b70fae94ce041c9a1c6d3a31a3f7e4
diff --git a/trunk/include/asm-mips/addrspace.h b/trunk/include/asm-mips/addrspace.h
index 42520cc84b0f..1386af1cb7d9 100644
--- a/trunk/include/asm-mips/addrspace.h
+++ b/trunk/include/asm-mips/addrspace.h
@@ -129,6 +129,7 @@
 #if defined (CONFIG_CPU_R4300)						\
     || defined (CONFIG_CPU_R4X00)					\
     || defined (CONFIG_CPU_R5000)					\
+    || defined (CONFIG_CPU_RM7000)					\
     || defined (CONFIG_CPU_NEVADA)					\
     || defined (CONFIG_CPU_TX49XX)					\
     || defined (CONFIG_CPU_MIPS64)