diff --git a/[refs] b/[refs]
index 8ce2da620621..a76bdc7f8930 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 199862892e83d04a294eebad45adc40c658b8630
+refs/heads/master: ff19fed4fe54f2f1dd439ac02969333ea9a9b4ff
diff --git a/trunk/arch/blackfin/Kconfig b/trunk/arch/blackfin/Kconfig
index be6097163b07..0c1f86e3e44a 100644
--- a/trunk/arch/blackfin/Kconfig
+++ b/trunk/arch/blackfin/Kconfig
@@ -1129,6 +1129,7 @@ endchoice
 
 config PM_WAKEUP_BY_GPIO
 	bool "Allow Wakeup from Standby by GPIO"
+	depends on PM && !BF54x
 
 config PM_WAKEUP_GPIO_NUMBER
 	int "GPIO number"