summaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2011-12-20 10:05:59 -0800
committerOlof Johansson <olof@lixom.net>2011-12-20 10:05:59 -0800
commit9838309b333bfb286d9e32b6a9aea8cc1dcbb537 (patch)
treeff2044385cbbdc78cb2d96f64713ab04a10bec95 /arch/arm/Kconfig
parent844e8a16f25568eefd02a6bfb40bdd9bc04704b8 (diff)
parentbfd912c0dd119d98923494d0cbeee571df756b8a (diff)
Merge branch 'u300/cleanup' into next/cleanup
* u300/cleanup: ARM: u300: delete memory.h
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 0d961cb7be9..540a6618084 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -893,7 +893,6 @@ config ARCH_U300
select HAVE_MACH_CLKDEV
select GENERIC_GPIO
select ARCH_REQUIRE_GPIOLIB
- select NEED_MACH_MEMORY_H
help
Support for ST-Ericsson U300 series mobile platforms.