From e417cc67ed0af2b7b7a28a3222c830e13b21ab38 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <michael.frysinger@analog.com>
Date: Tue, 27 Nov 2007 00:46:42 -0500
Subject: [PATCH] --- yaml --- r: 74235 b: refs/heads/master c:
 6957c8280080d985518133eab3a57d715a57be78 h: refs/heads/master i:   74233:
 ebd1df7a72baf55a4e9d0c02e1383be813268b32   74231:
 f3c1cd70caaf07b16b50752407d5556c25d09154 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/input/keyboard/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 35842698c7a5..e59b2e6f305c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a2e391190b17f4fb895bd2d5e8b08c7c8f897a2
+refs/heads/master: 6957c8280080d985518133eab3a57d715a57be78
diff --git a/trunk/drivers/input/keyboard/Kconfig b/trunk/drivers/input/keyboard/Kconfig
index 2316a018fae6..dfa6592c10f6 100644
--- a/trunk/drivers/input/keyboard/Kconfig
+++ b/trunk/drivers/input/keyboard/Kconfig
@@ -286,7 +286,7 @@ config KEYBOARD_MAPLE
 
 config KEYBOARD_BFIN
 	tristate "Blackfin BF54x keypad support"
-	depends on BF54x
+	depends on (BF54x && !BF544)
 	help
 	  Say Y here if you want to use the BF54x keypad.