Merge branch 'next' into for-linus

[mirror_ubuntu-artful-kernel.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index c62ca1b47a37d29f1164e7e57c3d7964a532be96..269d4c3658cb062926972f9cae6ede7faa8d9522 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"
-       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).
@@ -190,7 +190,7 @@ config KEYBOARD_GPIO
 
 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
@@ -241,7 +241,7 @@ config KEYBOARD_TCA8418
 
 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.
@@ -418,6 +418,16 @@ config KEYBOARD_NOMADIK
          To compile this driver as a module, choose M here: the
          module will be called nmk-ske-keypad.
 
+config KEYBOARD_NSPIRE
+       tristate "TI-NSPIRE built-in keyboard"
+       depends on ARCH_NSPIRE && OF
+       select INPUT_MATRIXKMAP
+       help
+         Say Y here if you want to use the built-in keypad on TI-NSPIRE.
+
+         To compile this driver as a module, choose M here: the
+         module will be called nspire-keypad.
+
 config KEYBOARD_TEGRA
        tristate "NVIDIA Tegra internal matrix keyboard controller support"
        depends on ARCH_TEGRA && OF
@@ -442,6 +452,7 @@ config KEYBOARD_OPENCORES
 config KEYBOARD_PXA27x
        tristate "PXA27x/PXA3xx keypad support"
        depends on PXA27x || PXA3xx || ARCH_MMP
+       select INPUT_MATRIXKMAP
        help
          Enable support for PXA27x/PXA3xx keypad controller.
 
@@ -629,4 +640,16 @@ config KEYBOARD_W90P910
          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