Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / drivers / input / misc / Kconfig

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 5c0a631d145537b5d597899147d186550dfde3df..1acfa3a05aad50ced8ab8febf413987aafade9ac 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -193,6 +193,16 @@ config INPUT_CM109
          To compile this driver as a module, choose M here: the module will be
          called cm109.
 
+config INPUT_TWL4030_PWRBUTTON
+       tristate "TWL4030 Power button Driver"
+       depends on TWL4030_CORE
+       help
+         Say Y here if you want to enable power key reporting via the
+         TWL4030 family of chips.
+
+         To compile this driver as a module, choose M here. The module will
+         be called twl4030_pwrbutton.
+
 config INPUT_UINPUT
        tristate "User level driver support"
        help
@@ -232,7 +242,7 @@ config INPUT_GPIO_ROTARY_ENCODER
        depends on GPIOLIB && GENERIC_GPIO
        help
          Say Y here to add support for rotary encoders connected to GPIO lines.
-         Check file:Documentation/incput/rotary_encoder.txt for more
+         Check file:Documentation/input/rotary-encoder.txt for more
          information.
 
          To compile this driver as a module, choose M here: the
@@ -250,4 +260,13 @@ config INPUT_RB532_BUTTON
          To compile this driver as a module, choose M here: the
          module will be called rb532_button.
 
+config INPUT_DM355EVM
+       tristate "TI DaVinci DM355 EVM Keypad and IR Remote"
+       depends on MFD_DM355EVM_MSP
+       help
+         Supports the pushbuttons and IR remote used with
+         the DM355 EVM board.
+
+         To compile this driver as a module, choose M here: the
+         module will be called dm355evm_keys.
 endif