Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[deliverable/linux.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index e1d8003d01f84a3d411991c53f73a5113a10214c..58917525126e86fd06cb632b2cbb3f558b0a2f83 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -295,6 +295,19 @@ config TOUCHSCREEN_FUJITSU
          To compile this driver as a module, choose M here: the
          module will be called fujitsu-ts.
 
+config TOUCHSCREEN_GOODIX
+       tristate "Goodix I2C touchscreen"
+       depends on I2C && ACPI
+       help
+         Say Y here if you have the Goodix touchscreen (such as one
+         installed in Onda v975w tablets) connected to your
+         system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called goodix.
+
 config TOUCHSCREEN_ILI210X
        tristate "Ilitek ILI210X based touchscreen"
        depends on I2C
@@ -334,6 +347,18 @@ config TOUCHSCREEN_GUNZE
          To compile this driver as a module, choose M here: the
          module will be called gunze.
 
+config TOUCHSCREEN_ELAN
+       tristate "Elan eKTH I2C touchscreen"
+       depends on I2C
+       help
+         Say Y here if you have an Elan eKTH I2C touchscreen
+         connected to your system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called elants_i2c.
+
 config TOUCHSCREEN_ELO
        tristate "Elo serial touchscreens"
        select SERIO