Pull apm-freeze-fix into release branch

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

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 2316a018fae64212623ec6b7d24003aea6966e8c..dfa6592c10f646bb66465b173813e325feaa7860 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/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.