diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-06 06:52:53 +0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@fluxnic.net> | 2011-10-13 20:49:29 +0400 |
| commit | e2c72ff9dc535e2be25736b11a42d53dfffcfbb6 (patch) | |
| tree | e0b8bb1e3759b9d9305408eb75bb319a5d4a3578 /arch | |
| parent | 8b5da2df272d5aaceb17addae8afc068b447aa51 (diff) | |
| download | linux-e2c72ff9dc535e2be25736b11a42d53dfffcfbb6.tar.xz | |
ARM: mach-mv78xx0: remove mach/memory.h
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/memory.h | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3776fccd923f..b987221f085f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -541,6 +541,7 @@ config ARCH_MV78XX0 select ARCH_REQUIRE_GPIOLIB select GENERIC_CLOCKEVENTS select PLAT_ORION + select NO_MACH_MEMORY_H help Support for the following Marvell MV78xx0 series SoCs: MV781x0, MV782x0. diff --git a/arch/arm/mach-mv78xx0/include/mach/memory.h b/arch/arm/mach-mv78xx0/include/mach/memory.h deleted file mode 100644 index a648c51f2e42..000000000000 --- a/arch/arm/mach-mv78xx0/include/mach/memory.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * arch/arm/mach-mv78xx0/include/mach/memory.h - */ - -#ifndef __ASM_ARCH_MEMORY_H -#define __ASM_ARCH_MEMORY_H - -#define PLAT_PHYS_OFFSET UL(0x00000000) - -#endif |