diff --git a/[refs] b/[refs]
index 1687cd7e33c2..7ebbdb21e5b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e4eb42999ae155c3ac1cdb5dacbd419184064fb
+refs/heads/master: e3fd17458e4721d4ae0f0aab1c79b039575ac9c6
diff --git a/trunk/arch/arm/plat-nomadik/Kconfig b/trunk/arch/arm/plat-nomadik/Kconfig
index e27ee3134056..159daf583f85 100644
--- a/trunk/arch/arm/plat-nomadik/Kconfig
+++ b/trunk/arch/arm/plat-nomadik/Kconfig
@@ -4,7 +4,7 @@
 
 config PLAT_NOMADIK
 	bool
-	depends on ARCH_NOMADIK
+	depends on ARCH_NOMADIK || ARCH_U8500
 	default y
 	help
 	  Common platform code for Nomadik and other ST-Ericsson