From 6ccd0e67e28ca76053298bf438ac1d60f8e3883c Mon Sep 17 00:00:00 2001
From: Michael Hennerich <michael.hennerich@analog.com>
Date: Wed, 4 Mar 2009 17:35:51 +0800
Subject: [PATCH] --- yaml --- r: 132083 b: refs/heads/master c:
 ff19fed4fe54f2f1dd439ac02969333ea9a9b4ff h: refs/heads/master i:   132081:
 3d5f113398d6bc42e8e2d1834f7506f5faa400e4   132079:
 894a532cea530986b046dd115d606f28dc4d9650 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/blackfin/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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"