summaryrefslogtreecommitdiff
path: root/arch/arm/mach-sti
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-18 19:25:47 +0400
committerArnd Bergmann <arnd@arndb.de>2014-03-18 19:25:47 +0400
commita65b5f4ccda42f416b7edf2c83ef9ccd5a8a181d (patch)
treeff2025ad147593b78b6b93b13727021a8ccc6a56 /arch/arm/mach-sti
parent9ad2a24f370159c350e9ec5dd3b91a1f3d76234e (diff)
parent4b8b5f25b7485eaf60a40f68451b3b7b741eef59 (diff)
downloadlinux-a65b5f4ccda42f416b7edf2c83ef9ccd5a8a181d.tar.xz
Merge branch 'cleanup/kconfig' into next/drivers
This resolves a conflict between the new sti reset controller driver and the Kconfig cleanup. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-sti')
-rw-r--r--arch/arm/mach-sti/Kconfig4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
index 25506209e97a..abf9ee9bbc3f 100644
--- a/arch/arm/mach-sti/Kconfig
+++ b/arch/arm/mach-sti/Kconfig
@@ -1,15 +1,11 @@
menuconfig ARCH_STI
bool "STMicroelectronics Consumer Electronics SOCs with Device Trees" if ARCH_MULTI_V7
- select GENERIC_CLOCKEVENTS
- select CLKDEV_LOOKUP
select ARM_GIC
select ARM_GLOBAL_TIMER
select PINCTRL
select PINCTRL_ST
select MFD_SYSCON
select ARCH_HAS_RESET_CONTROLLER
- select MIGHT_HAVE_CACHE_L2X0
- select HAVE_SMP
select HAVE_ARM_SCU if SMP
select ARCH_REQUIRE_GPIOLIB
select ARM_ERRATA_754322