diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-05 22:52:52 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-09-26 10:12:01 -0400 |
| commit | 8fce8b2080bf49de9e5d96161932edcbffad11cf (patch) | |
| tree | 322fd654f97d7b732b8de677782dbbdbe17a278f /arch/arm | |
| parent | 748e91cb3c6040a73b63afc348fe3d6042bdeef3 (diff) | |
ARM: mach-orion5x: 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-orion5x/include/mach/memory.h | 12 |
2 files changed, 1 insertions, 12 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b2235184e7b6..465bdb25ac13 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -552,6 +552,7 @@ config ARCH_ORION5X | |||
| 552 | select ARCH_REQUIRE_GPIOLIB | 552 | select ARCH_REQUIRE_GPIOLIB |
| 553 | select GENERIC_CLOCKEVENTS | 553 | select GENERIC_CLOCKEVENTS |
| 554 | select PLAT_ORION | 554 | select PLAT_ORION |
| 555 | select NO_MACH_MEMORY_H | ||
| 555 | help | 556 | help |
| 556 | Support for the following Marvell Orion 5x series SoCs: | 557 | Support for the following Marvell Orion 5x series SoCs: |
| 557 | Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182), | 558 | Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182), |
diff --git a/arch/arm/mach-orion5x/include/mach/memory.h b/arch/arm/mach-orion5x/include/mach/memory.h deleted file mode 100644 index 6769917882fe..000000000000 --- a/arch/arm/mach-orion5x/include/mach/memory.h +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-orion5x/include/mach/memory.h | ||
| 3 | * | ||
| 4 | * Marvell Orion memory definitions | ||
| 5 | */ | ||
| 6 | |||
| 7 | #ifndef __ASM_ARCH_MEMORY_H | ||
| 8 | #define __ASM_ARCH_MEMORY_H | ||
| 9 | |||
| 10 | #define PLAT_PHYS_OFFSET UL(0x00000000) | ||
| 11 | |||
| 12 | #endif | ||