diff --git a/[refs] b/[refs]
index e146a11df3f5..7f17df11a5db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: db38501511a7513ec4f0ae9922d847c135cf3c78
+refs/heads/master: 41b0483ee54d89f9ad068ceae3c91cdc7594d050
diff --git a/trunk/include/asm-mips/mach-generic/spaces.h b/trunk/include/asm-mips/mach-generic/spaces.h
index f0571b651940..c9fa4b14968d 100644
--- a/trunk/include/asm-mips/mach-generic/spaces.h
+++ b/trunk/include/asm-mips/mach-generic/spaces.h
@@ -12,6 +12,13 @@
 
 #include <linux/const.h>
 
+/*
+ * This gives the physical RAM offset.
+ */
+#ifndef PHYS_OFFSET
+#define PHYS_OFFSET		_AC(0, UL)
+#endif
+
 #ifdef CONFIG_32BIT
 
 #define CAC_BASE		_AC(0x80000000, UL)
diff --git a/trunk/include/asm-mips/page.h b/trunk/include/asm-mips/page.h
index 5c3239dad0f2..c56c6a85908d 100644
--- a/trunk/include/asm-mips/page.h
+++ b/trunk/include/asm-mips/page.h
@@ -34,12 +34,8 @@
 
 #ifndef __ASSEMBLY__
 
-/*
- * This gives the physical RAM offset.
- */
-#ifndef PHYS_OFFSET
-#define PHYS_OFFSET		0UL
-#endif
+#include <linux/pfn.h>
+#include <linux/io.h>
 
 /*
  * It's normally defined only for FLATMEM config but it's
@@ -48,9 +44,6 @@
  */
 #define ARCH_PFN_OFFSET		PFN_UP(PHYS_OFFSET)
 
-#include <linux/pfn.h>
-#include <asm/io.h>
-
 extern void clear_page(void * page);
 extern void copy_page(void * to, void * from);