Merge branch 'for-2.6.39' into for-2.6.40

[~andy/linux] / arch / arm / mach-s5pv210 / include / mach / memory.h

diff --git a/arch/arm/mach-s5pv210/include/mach/memory.h b/arch/arm/mach-s5pv210/include/mach/memory.h
index d503e0c4ce4f24cb22be05543674f03902d78755..7b5fcf0da0c4b9af30b9cfec7282aaef9f5048d6 100644 (file)
--- a/arch/arm/mach-s5pv210/include/mach/memory.h
+++ b/arch/arm/mach-s5pv210/include/mach/memory.h
@@ -13,7 +13,7 @@
 #ifndef __ASM_ARCH_MEMORY_H
 #define __ASM_ARCH_MEMORY_H
 
-#define PHYS_OFFSET            UL(0x20000000)
+#define PLAT_PHYS_OFFSET               UL(0x20000000)
 #define CONSISTENT_DMA_SIZE    (SZ_8M + SZ_4M + SZ_2M)
 
 /*