aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/mach-orion5x/include/mach/memory.h12
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