Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=41b0483ee54d89f9ad068ceae3c91cdc7594d050
Commit:     41b0483ee54d89f9ad068ceae3c91cdc7594d050
Parent:     db38501511a7513ec4f0ae9922d847c135cf3c78
Author:     Franck Bui-Huu <[EMAIL PROTECTED]>
AuthorDate: Mon Jun 4 17:46:34 2007 +0200
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Tue Jul 10 17:32:57 2007 +0100

    [MIPS] Move PHY_OFFSET definition in spaces.h
    
    Signed-off-by: Franck Bui-Huu <[EMAIL PROTECTED]>
    Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 include/asm-mips/mach-generic/spaces.h |    7 +++++++
 include/asm-mips/page.h                |   11 ++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/asm-mips/mach-generic/spaces.h 
b/include/asm-mips/mach-generic/spaces.h
index f0571b6..c9fa4b1 100644
--- 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 5c3239d..c56c6a8 100644
--- 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);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to