summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-03-19 22:01:25 +0100
committerArnd Bergmann <arnd@arndb.de>2013-03-19 22:01:25 +0100
commitae55afce201cb7d1bb05727834ba9d8255c360c9 (patch)
tree09ad5636d5437734d8ae2834dd6046b87732b430 /arch
parentMerge branch 'spear/multiplatform' into next/multiplatform (diff)
downloadlinux-ae55afce201cb7d1bb05727834ba9d8255c360c9.tar.xz
linux-ae55afce201cb7d1bb05727834ba9d8255c360c9.zip
ARM: nomadik: hide MACH_NOMADIK_8815NHK in Kconfig
The nomadik multiplatform support made it possible to select MACH_NOMADIK_8815NHK without selecting ARCH_NOMADIK, which leads to build errors when we also select ARMv6/v7 targets. Adding the ifdef here restores the intended behavior. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-nomadik/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig
index 954f0e30f3a0..3213badf25d8 100644
--- a/arch/arm/mach-nomadik/Kconfig
+++ b/arch/arm/mach-nomadik/Kconfig
@@ -17,6 +17,7 @@ config ARCH_NOMADIK
help
Support for the Nomadik platform by ST-Ericsson
+if ARCH_NOMADIK
menu "Nomadik boards"
config MACH_NOMADIK_8815NHK
@@ -26,6 +27,7 @@ config MACH_NOMADIK_8815NHK
select I2C_ALGOBIT
endmenu
+endif
config NOMADIK_8815
depends on ARCH_NOMADIK