diff --git a/[refs] b/[refs]
index 7cf0c66db8a3..de42a0771dca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7b6130e736b031c8b42ded4027b4793a7b1ef79
+refs/heads/master: 0e3a9aab954910b1dcdf2133a46a58cc729ce3dc
diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
index 754a75e58792..496d635f89b2 100644
--- a/trunk/arch/sh/Kconfig
+++ b/trunk/arch/sh/Kconfig
@@ -605,7 +605,7 @@ config BOOT_LINK_OFFSET
 
 config UBC_WAKEUP
 	bool "Wakeup UBC on startup"
-	depends on CPU_SH4
+	depends on CPU_SH4 && !CPU_SH4A
 	help
 	  Selecting this option will wakeup the User Break Controller (UBC) on
 	  startup. Although the UBC is left in an awake state when the processor