diff --git a/[refs] b/[refs]
index adbb8697b9ee..35d18831dd7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7743a087640cbb0b5d81ee8a73b7ffed468f7bb6
+refs/heads/master: 8cfc1ef96a873d35d2fb86ac8ccf34d388a48e55
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
index 465bdb25ac13..01343438e91b 100644
--- a/trunk/arch/arm/Kconfig
+++ b/trunk/arch/arm/Kconfig
@@ -462,6 +462,7 @@ config ARCH_IOP33X
 	select PLAT_IOP
 	select PCI
 	select ARCH_REQUIRE_GPIOLIB
+	select NO_MACH_MEMORY_H
 	help
 	  Support for Intel's IOP33X (XScale) family of processors.
 
diff --git a/trunk/arch/arm/mach-iop33x/include/mach/memory.h b/trunk/arch/arm/mach-iop33x/include/mach/memory.h
deleted file mode 100644
index 8e1daf7006b6..000000000000
--- a/trunk/arch/arm/mach-iop33x/include/mach/memory.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/arm/mach-iop33x/include/mach/memory.h
- */
-
-#ifndef __MEMORY_H
-#define __MEMORY_H
-
-/*
- * Physical DRAM offset.
- */
-#define PLAT_PHYS_OFFSET	UL(0x00000000)
-
-#endif