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:11:59 -0400 |
| commit | e33e51070cbe8979a9aac43a6d5e773eaa44f9b1 (patch) | |
| tree | daa6d6692e223094c4a6d5dfd2af9e1b96890987 /arch/arm | |
| parent | 1b9f95f8ade9efc2bd49f0e7b9dc61a038ac3eef (diff) | |
ARM: mach-dove: remove include/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-dove/include/mach/memory.h | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1ecb09bca27e..646cc4becb69 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -503,6 +503,7 @@ config ARCH_DOVE | |||
| 503 | select ARCH_REQUIRE_GPIOLIB | 503 | select ARCH_REQUIRE_GPIOLIB |
| 504 | select GENERIC_CLOCKEVENTS | 504 | select GENERIC_CLOCKEVENTS |
| 505 | select PLAT_ORION | 505 | select PLAT_ORION |
| 506 | select NO_MACH_MEMORY_H | ||
| 506 | help | 507 | help |
| 507 | Support for the Marvell Dove SoC 88AP510 | 508 | Support for the Marvell Dove SoC 88AP510 |
| 508 | 509 | ||
diff --git a/arch/arm/mach-dove/include/mach/memory.h b/arch/arm/mach-dove/include/mach/memory.h deleted file mode 100644 index bbc93fee6c75..000000000000 --- a/arch/arm/mach-dove/include/mach/memory.h +++ /dev/null | |||
| @@ -1,10 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * arch/arm/mach-dove/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 | ||