Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 8816ca94426517b3de31ab8cb3912a47c36f81ba..bbc66d4ab5675bdb5e6b2cc0f3c2de8a11e01cc6 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -312,7 +312,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.