---

yaml --- r: 132083 b: refs/heads/master c: ff19fed h: refs/heads/master i: 132081: 3d5f113 132079: 894a532 v: v3
git-mirror · Mar 4, 2009 · 6ccd0e6 · 6ccd0e6
1 parent 2eb1c45
commit 6ccd0e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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"