diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-03-18 11:25:47 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-03-18 11:25:47 -0400 |
| commit | a65b5f4ccda42f416b7edf2c83ef9ccd5a8a181d (patch) | |
| tree | ff2025ad147593b78b6b93b13727021a8ccc6a56 /arch/arm/mach-sti | |
| parent | 9ad2a24f370159c350e9ec5dd3b91a1f3d76234e (diff) | |
| parent | 4b8b5f25b7485eaf60a40f68451b3b7b741eef59 (diff) | |
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/Kconfig | 4 |
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 @@ | |||
| 1 | menuconfig ARCH_STI | 1 | menuconfig ARCH_STI |
| 2 | bool "STMicroelectronics Consumer Electronics SOCs with Device Trees" if ARCH_MULTI_V7 | 2 | bool "STMicroelectronics Consumer Electronics SOCs with Device Trees" if ARCH_MULTI_V7 |
| 3 | select GENERIC_CLOCKEVENTS | ||
| 4 | select CLKDEV_LOOKUP | ||
| 5 | select ARM_GIC | 3 | select ARM_GIC |
| 6 | select ARM_GLOBAL_TIMER | 4 | select ARM_GLOBAL_TIMER |
| 7 | select PINCTRL | 5 | select PINCTRL |
| 8 | select PINCTRL_ST | 6 | select PINCTRL_ST |
| 9 | select MFD_SYSCON | 7 | select MFD_SYSCON |
| 10 | select ARCH_HAS_RESET_CONTROLLER | 8 | select ARCH_HAS_RESET_CONTROLLER |
| 11 | select MIGHT_HAVE_CACHE_L2X0 | ||
| 12 | select HAVE_SMP | ||
| 13 | select HAVE_ARM_SCU if SMP | 9 | select HAVE_ARM_SCU if SMP |
| 14 | select ARCH_REQUIRE_GPIOLIB | 10 | select ARCH_REQUIRE_GPIOLIB |
| 15 | select ARM_ERRATA_754322 | 11 | select ARM_ERRATA_754322 |