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

[firefly-linux-kernel-4.4.55.git] / drivers / input / keyboard / Kconfig

diff --git a/drivers/input/keyboard/Kconfig b/drivers/input/keyboard/Kconfig
index f7e79b48134940a191edd379b5671edfa7d6f358..a3958c63d7d59c28841ca0249388e5934fbf8535 100644 (file)
--- a/drivers/input/keyboard/Kconfig
+++ b/drivers/input/keyboard/Kconfig
@@ -665,4 +665,14 @@ config KEYBOARD_CROS_EC
          To compile this driver as a module, choose M here: the
          module will be called cros_ec_keyb.
 
+config KEYBOARD_CAP1106
+       tristate "Microchip CAP1106 touch sensor"
+       depends on OF && I2C
+       select REGMAP_I2C
+       help
+         Say Y here to enable the CAP1106 touch sensor driver.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cap1106.
+
 endif