diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-05 22:52:51 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-09-26 10:12:00 -0400 |
| commit | 748e91cb3c6040a73b63afc348fe3d6042bdeef3 (patch) | |
| tree | bf9d14e802d026ace465104892ffa4bf80c91875 /arch/arm | |
| parent | e33e51070cbe8979a9aac43a6d5e773eaa44f9b1 (diff) | |
ARM: mach-kirkwood: remove mach/memory.h
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/memory.h | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 646cc4becb6..b2235184e7b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -514,6 +514,7 @@ config ARCH_KIRKWOOD | |||
| 514 | select ARCH_REQUIRE_GPIOLIB | 514 | select ARCH_REQUIRE_GPIOLIB |
| 515 | select GENERIC_CLOCKEVENTS | 515 | select GENERIC_CLOCKEVENTS |
| 516 | select PLAT_ORION | 516 | select PLAT_ORION |
| 517 | select NO_MACH_MEMORY_H | ||
| 517 | help | 518 | help |
| 518 | Support for the following Marvell Kirkwood series SoCs: | 519 | Support for the following Marvell Kirkwood series SoCs: |
| 519 | 88F6180, 88F6192 and 88F6281. | 520 | 88F6180, 88F6192 and 88F6281. |
diff --git a/arch/arm/mach-kirkwood/include/mach/memory.h b/arch/arm/mach-kirkwood/include/mach/memory.h deleted file mode 100644 index 4600b44e3ad..00000000000 --- a/arch/arm/mach-kirkwood/include/mach/memory.h +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-kirkwood/include/mach/memory.h | ||
| 3 | */ | ||
| 4 | |||
| 5 | #ifndef __ASM_ARCH_MEMORY_H | ||
| 6 | #define __ASM_ARCH_MEMORY_H | ||
| 7 | |||
| 8 | #define PLAT_PHYS_OFFSET UL(0x00000000) | ||
| 9 | |||
| 10 | #endif | ||