diff --git a/[refs] b/[refs]
index de511769685a..74b2d787c761 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a768d04639307dbebbbbc8f4216e3a06bc602d7
+refs/heads/master: ae55afce201cb7d1bb05727834ba9d8255c360c9
diff --git a/trunk/arch/arm/mach-nomadik/Kconfig b/trunk/arch/arm/mach-nomadik/Kconfig
index 954f0e30f3a0..3213badf25d8 100644
--- a/trunk/arch/arm/mach-nomadik/Kconfig
+++ b/trunk/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