summaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-02-14 10:26:15 +0100
committerLinus Walleij <linus.walleij@linaro.org>2014-06-27 10:15:22 +0200
commite6dc195c1c69ea525f5001f72d666ac8342139e4 (patch)
tree829fa1cc63919526257aaf7db3a8dd51ae1dbefe /arch/arm/Kconfig
parenta497c3ba1d97fc69c1e78e7b96435ba8c2cb42ee (diff)
ARM: integrator: get rid of <mach/memory.h>
The Integrator has a custom <mach/memory.h> header defining the BUS_OFFSET for *_to_bus and bus_to_* operations as offset from 0x80000000. This switches the Integrator over to using the mechanism introduced for the Keystone to provide the same offset using the device tree, deletes <mach/memory.h> and augments the Integrator device tree to provide the bus offset. Cc: Grygorii Strashko <grygorii.strashko@ti.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Jonathan Austin <jonathan.austin@arm.com> Cc: Russell King <linux@arm.linux.org.uk> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 245058b3b0ef..06aab1024305 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -320,7 +320,6 @@ config ARCH_INTEGRATOR
select HAVE_TCM
select ICST
select MULTI_IRQ_HANDLER
- select NEED_MACH_MEMORY_H
select PLAT_VERSATILE
select SPARSE_IRQ
select USE_OF