diff options
Diffstat (limited to 'arch/arm')
-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 | |||
541 | select ARCH_REQUIRE_GPIOLIB | 541 | select ARCH_REQUIRE_GPIOLIB |
542 | select GENERIC_CLOCKEVENTS | 542 | select GENERIC_CLOCKEVENTS |
543 | select PLAT_ORION | 543 | select PLAT_ORION |
544 | select NO_MACH_MEMORY_H | ||
544 | help | 545 | help |
545 | Support for the following Marvell MV78xx0 series SoCs: | 546 | Support for the following Marvell MV78xx0 series SoCs: |
546 | MV781x0, MV782x0. | 547 | 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 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-mv78xx0/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 | ||