Merge branch 'for-rmk-realview' of git://linux-arm.org/linux-2.6 into devel

[linux-2.6-block.git] / arch / arm / mach-realview / include / mach / memory.h

diff --git a/arch/arm/mach-realview/include/mach/memory.h b/arch/arm/mach-realview/include/mach/memory.h
index 65a0742094f7ca93518137e1e7f59490c6b00d59..293c30025e7e0eb42438cf5fb20be26082e7cd2b 100644 (file)
--- a/arch/arm/mach-realview/include/mach/memory.h
+++ b/arch/arm/mach-realview/include/mach/memory.h
@@ -23,6 +23,10 @@
 /*
  * Physical DRAM offset.
  */
+#ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET
+#define PHYS_OFFSET            UL(0x70000000)
+#else
 #define PHYS_OFFSET            UL(0x00000000)
+#endif
 
 #endif