Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

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

diff --git a/arch/arm/mach-ns9xxx/include/mach/memory.h b/arch/arm/mach-ns9xxx/include/mach/memory.h
index 6107193..5c65aee 100644 (file)
--- a/arch/arm/mach-ns9xxx/include/mach/memory.h
+++ b/arch/arm/mach-ns9xxx/include/mach/memory.h
@@ -19,6 +19,6 @@
 #define NS9XXX_CS2STAT_LENGTH  UL(0x1000)
 #define NS9XXX_CS3STAT_LENGTH  UL(0x1000)
 
-#define PHYS_OFFSET    UL(0x00000000)
+#define PLAT_PHYS_OFFSET       UL(0x00000000)
 
 #endif