From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 19 Mar 2013 21:01:25 +0000 (+0100)
Subject: ARM: nomadik: hide MACH_NOMADIK_8815NHK in Kconfig
X-Git-Tag: next-20130322~14^2~3^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ae55afce201cb7d1bb05727834ba9d8255c360c9;p=karo-tx-linux.git

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>
---

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