Merge branch 'next' into for-linus

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

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index ad1b6c90bc4d4c6b40f4240a31e601d17d84df62..bbab23a58c594e8ab4d1e975197cd2308ceb9500 100644 (file)
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -752,6 +752,17 @@ config INPUT_IQS269A
          To compile this driver as a module, choose M here: the
          module will be called iqs269a.
 
+config INPUT_IQS626A
+       tristate "Azoteq IQS626A capacitive touch controller"
+       depends on I2C
+       select REGMAP_I2C
+       help
+         Say Y to enable support for the Azoteq IQS626A capacitive
+         touch controller.
+
+         To compile this driver as a module, choose M here: the
+         module will be called iqs626a.
+
 config INPUT_CMA3000
        tristate "VTI CMA3000 Tri-axis accelerometer"
        help