diff --git a/[refs] b/[refs]
index 6b2054430888..8fe8de2fa687 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ce3e9c2a2cfb8849dd471349fe5e6bc37c0f13f
+refs/heads/master: c429886a7091f9d26dee7d01c20fd822f62c35e0
diff --git a/trunk/arch/blackfin/Kconfig.debug b/trunk/arch/blackfin/Kconfig.debug
index 3c49f76b37bc..d1825cb24768 100644
--- a/trunk/arch/blackfin/Kconfig.debug
+++ b/trunk/arch/blackfin/Kconfig.debug
@@ -238,7 +238,7 @@ config EARLY_PRINTK
 config NMI_WATCHDOG
 	bool "Enable NMI watchdog to help debugging lockup on SMP"
 	default n
-	depends on (SMP && !BFIN_SCRATCH_REG_RETN)
+	depends on SMP
 	help
 	  If any CPU in the system does not execute the period local timer
 	  interrupt for more than 5 seconds, then the NMI handler dumps debug