[MIPS] Move PHY_OFFSET definition in spaces.h

Signed-off-by: Franck Bui-Huu <fbuihuu@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/include/asm-mips/mach-generic/spaces.h b/include/asm-mips/mach-generic/spaces.h
index f0571b65194055a8c7774b46f35d2c9ab6e9fd63..c9fa4b14968d483ff6dd224c3a4daf23dc3b1143 100644 (file)
--- a/include/asm-mips/mach-generic/spaces.h
+++ b/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/include/asm-mips/page.h b/include/asm-mips/page.h
index 5c3239dad0f26ef09306252cb272586d4d5af740..c56c6a85908d1f367aaa3109ed01fcf4a473d20e 100644 (file)
--- a/include/asm-mips/page.h
+++ b/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);