Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[mv-sheeva.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index b171f63fe4d716a2bdcd920e73aec80356de0581..9cc488d2149019626101d3c5f76d0b2bdab0fe57 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -395,6 +395,16 @@ config KEYBOARD_SH_KEYSC
          To compile this driver as a module, choose M here: the
          module will be called sh_keysc.
 
+config KEYBOARD_STMPE
+       tristate "STMPE keypad support"
+       depends on MFD_STMPE
+       help
+         Say Y here if you want to use the keypad controller on STMPE I/O
+         expanders.
+
+         To compile this driver as a module, choose M here: the module will be
+         called stmpe-keypad.
+
 config KEYBOARD_DAVINCI
        tristate "TI DaVinci Key Scan"
        depends on ARCH_DAVINCI_DM365