diff options
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-iop32x/include/mach/memory.h | 13 |
2 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index dd72287cb29c..2ac205106003 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -452,6 +452,7 @@ config ARCH_IOP32X | |||
452 | select PLAT_IOP | 452 | select PLAT_IOP |
453 | select PCI | 453 | select PCI |
454 | select ARCH_REQUIRE_GPIOLIB | 454 | select ARCH_REQUIRE_GPIOLIB |
455 | select NO_MACH_MEMORY_H | ||
455 | help | 456 | help |
456 | Support for Intel's 80219 and IOP32X (XScale) family of | 457 | Support for Intel's 80219 and IOP32X (XScale) family of |
457 | processors. | 458 | processors. |
diff --git a/arch/arm/mach-iop32x/include/mach/memory.h b/arch/arm/mach-iop32x/include/mach/memory.h deleted file mode 100644 index 169cc239f76c..000000000000 --- a/arch/arm/mach-iop32x/include/mach/memory.h +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-iop32x/include/mach/memory.h | ||
3 | */ | ||
4 | |||
5 | #ifndef __MEMORY_H | ||
6 | #define __MEMORY_H | ||
7 | |||
8 | /* | ||
9 | * Physical DRAM offset. | ||
10 | */ | ||
11 | #define PLAT_PHYS_OFFSET UL(0xa0000000) | ||
12 | |||
13 | #endif | ||