Merge branch 'for-3.10/drivers' of git://git.kernel.dk/linux-block

[~andy/linux] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index ac050066700086d2477d1e56f459bc6bc6f313d2..6a195d5e90ff6e3b62b463bf635cb5537334642e 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -628,4 +628,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