summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sti
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2014-06-10 09:06:10 -0500
committerArnd Bergmann <arnd@arndb.de>2014-06-17 17:09:48 +0200
commit21278aeafbfacfd62b3e613525f0c694a029dac1 (patch)
treef4d8ea51d28089d09c48ecb4f40bde90a151d721 /arch/arm/mach-sti
parent216e9d3e8b00424c13ca76ef97d707ddc7f57a8b (diff)
downloadlinux-21278aeafbfacfd62b3e613525f0c694a029dac1.tar.gz
linux-21278aeafbfacfd62b3e613525f0c694a029dac1.tar.bz2
linux-21278aeafbfacfd62b3e613525f0c694a029dac1.zip
ARM: use menuconfig for sub-arch menus
The System Type menu is getting quite long with platforms and is inconsistent in handling of sub-arch specific options. Tidy up the menu by making platform options a menuconfig entry containing any platform specific config items. [arnd: change OMAP part according to suggestion from Tony Lindgren <tony@atomide.com>] Signed-off-by: Rob Herring <robh@kernel.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-sti')
-rw-r--r--arch/arm/mach-sti/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sti/Kconfig b/arch/arm/mach-sti/Kconfig
index abf9ee9bbc3f..7e33e9d2c42e 100644
--- a/arch/arm/mach-sti/Kconfig
+++ b/arch/arm/mach-sti/Kconfig
@@ -1,5 +1,5 @@
menuconfig ARCH_STI
- bool "STMicroelectronics Consumer Electronics SOCs with Device Trees" if ARCH_MULTI_V7
+ bool "STMicroelectronics Consumer Electronics SOCs" if ARCH_MULTI_V7
select ARM_GIC
select ARM_GLOBAL_TIMER
select PINCTRL