Merge branch 'old_next' into next

[pandora-kernel.git] / arch / arm / mach-iop32x / include / mach / memory.h

diff --git a/arch/arm/mach-iop32x/include/mach/memory.h b/arch/arm/mach-iop32x/include/mach/memory.h
index c30f645..169cc23 100644 (file)
--- a/arch/arm/mach-iop32x/include/mach/memory.h
+++ b/arch/arm/mach-iop32x/include/mach/memory.h
@@ -8,6 +8,6 @@
 /*
  * Physical DRAM offset.
  */
-#define PHYS_OFFSET    UL(0xa0000000)
+#define PLAT_PHYS_OFFSET       UL(0xa0000000)
 
 #endif