Merge git://git.infradead.org/battery-2.6

[sfrench/cifs-2.6.git] / arch / arm / mach-pnx4008 / include / mach / memory.h

diff --git a/arch/arm/mach-pnx4008/include/mach/memory.h b/arch/arm/mach-pnx4008/include/mach/memory.h
index 0e8770081058954ab1ce1f255453e8a0d3d9505d..1275db61cee5d70cc11970b0226c65916cdc5680 100644 (file)
--- a/arch/arm/mach-pnx4008/include/mach/memory.h
+++ b/arch/arm/mach-pnx4008/include/mach/memory.h
@@ -16,6 +16,6 @@
 /*
  * Physical DRAM offset.
  */
-#define PHYS_OFFSET    UL(0x80000000)
+#define PLAT_PHYS_OFFSET       UL(0x80000000)
 
 #endif