diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-05 22:52:53 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-10-13 12:49:32 -0400 |
| commit | 489a1b5b894d6df2908b914ee9d0619a8ffc8e3e (patch) | |
| tree | 76d29a904c9d358ce43890e37896917acf30cc1f | |
| parent | b890f6b59d1210c682b310a28dabd134674b81e0 (diff) | |
ARM: mach-iop32x: remove mach/memory.h
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
| -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 | ||