Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

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

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 1ba25145b333bb79628d2b08c106825ed1c5c5fa..b171f63fe4d716a2bdcd920e73aec80356de0581 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -297,6 +297,18 @@ config KEYBOARD_MAX7359
          To compile this driver as a module, choose M here: the
          module will be called max7359_keypad.
 
+config KEYBOARD_MCS
+       tristate "MELFAS MCS Touchkey"
+       depends on I2C
+       help
+         Say Y here if you have the MELFAS MCS5000/5080 touchkey controller
+         chip in your system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called mcs_touchkey.
+
 config KEYBOARD_IMX
        tristate "IMX keypad support"
        depends on ARCH_MXC
@@ -342,6 +354,15 @@ config KEYBOARD_PXA930_ROTARY
          To compile this driver as a module, choose M here: the
          module will be called pxa930_rotary.
 
+config KEYBOARD_SAMSUNG
+       tristate "Samsung keypad support"
+       depends on SAMSUNG_DEV_KEYPAD
+       help
+         Say Y here if you want to use the Samsung keypad.
+
+         To compile this driver as a module, choose M here: the
+         module will be called samsung-keypad.
+
 config KEYBOARD_STOWAWAY
        tristate "Stowaway keyboard"
        select SERIO