diff options
author | Mark Brown <broonie@linaro.org> | 2013-10-07 14:51:17 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-10-07 14:51:17 +0100 |
commit | 77445a14d6a3a1f920e3b031603541fc807f5f9b (patch) | |
tree | 17a6a75a83fc602345969b29fdf7199afe2df526 /arch/arm/mach-u300/Kconfig | |
parent | 57841439b62e3ddb5ee50e765aa50330dde612d0 (diff) | |
parent | 702a4879ec337463f858c8ab467482cce260bf18 (diff) | |
download | linux-77445a14d6a3a1f920e3b031603541fc807f5f9b.tar.gz |
Merge remote-tracking branch 'spi/topic/bitbang' into HEAD
Diffstat (limited to 'arch/arm/mach-u300/Kconfig')
-rw-r--r-- | arch/arm/mach-u300/Kconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig index a85adcd00882..a1659863bfd5 100644 --- a/arch/arm/mach-u300/Kconfig +++ b/arch/arm/mach-u300/Kconfig @@ -1,7 +1,3 @@ -menu "ST-Ericsson AB U300/U335 Platform" - -comment "ST-Ericsson Mobile Platform Products" - config ARCH_U300 bool "ST-Ericsson U300 Series" if ARCH_MULTI_V5 depends on MMU @@ -25,7 +21,9 @@ config ARCH_U300 help Support for ST-Ericsson U300 series mobile platforms. -comment "ST-Ericsson U300/U335 Feature Selections" +if ARCH_U300 + +menu "ST-Ericsson AB U300/U335 Platform" config MACH_U300 depends on ARCH_U300 @@ -53,3 +51,5 @@ config MACH_U300_SPIDUMMY SPI framework and ARM PL022 support. endmenu + +endif |