Merge branch 'for-next' of git://github.com/rydberg/linux into next

[karo-tx-linux.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index 706e11bb6a32f08503a5bc14225969a9b4921c13..77412d8249632d549de2583b66408bbfd946bb33 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -175,7 +175,7 @@ config KEYBOARD_EP93XX
 
 config KEYBOARD_GPIO
        tristate "GPIO Buttons"
 
 config KEYBOARD_GPIO
        tristate "GPIO Buttons"

-       depends on GENERIC_GPIO
+       depends on GPIOLIB

        help
          This driver implements support for buttons connected
          to GPIO pins of various CPUs (and some other chips).
        help
          This driver implements support for buttons connected
          to GPIO pins of various CPUs (and some other chips).


@@ -190,7 +190,7 @@ config KEYBOARD_GPIO
 
 config KEYBOARD_GPIO_POLLED
        tristate "Polled GPIO buttons"
 
 config KEYBOARD_GPIO_POLLED
        tristate "Polled GPIO buttons"

-       depends on GENERIC_GPIO
+       depends on GPIOLIB

        select INPUT_POLLDEV
        help
          This driver implements support for buttons connected
        select INPUT_POLLDEV
        help
          This driver implements support for buttons connected


@@ -241,7 +241,7 @@ config KEYBOARD_TCA8418
 
 config KEYBOARD_MATRIX
        tristate "GPIO driven matrix keypad support"
 
 config KEYBOARD_MATRIX
        tristate "GPIO driven matrix keypad support"

-       depends on GENERIC_GPIO
+       depends on GPIOLIB

        select INPUT_MATRIXKMAP
        help
          Enable support for GPIO driven matrix keypad.
        select INPUT_MATRIXKMAP
        help
          Enable support for GPIO driven matrix keypad.


@@ -639,4 +639,16 @@ config KEYBOARD_W90P910
          To compile this driver as a module, choose M here: the
          module will be called w90p910_keypad.
 
          To compile this driver as a module, choose M here: the
          module will be called w90p910_keypad.
 

+config KEYBOARD_CROS_EC
+       tristate "ChromeOS EC keyboard"
+       select INPUT_MATRIXKMAP
+       depends on MFD_CROS_EC
+       help
+         Say Y here to enable the matrix keyboard used by ChromeOS devices
+         and implemented on the ChromeOS EC. You must enable one bus option
+         (MFD_CROS_EC_I2C or MFD_CROS_EC_SPI) to use this.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cros_ec_keyb.
+

 endif
 endif