Merge tag 'media/v4.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

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

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 754e6aa..efca013 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -117,7 +117,8 @@ config TOUCHSCREEN_ATMEL_MXT
 
 config TOUCHSCREEN_ATMEL_MXT_T37
        bool "Support T37 Diagnostic Data"
-       depends on TOUCHSCREEN_ATMEL_MXT && VIDEO_V4L2
+       depends on TOUCHSCREEN_ATMEL_MXT
+       depends on VIDEO_V4L2=y || (TOUCHSCREEN_ATMEL_MXT=m && VIDEO_V4L2=m)
        select VIDEOBUF2_VMALLOC
        help
          Say Y here if you want support to output data from the T37
@@ -313,19 +314,6 @@ config TOUCHSCREEN_EGALAX_SERIAL
          To compile this driver as a module, choose M here: the
          module will be called egalax_ts_serial.
 
-config TOUCHSCREEN_FT6236
-       tristate "FT6236 I2C touchscreen"
-       depends on I2C
-       depends on GPIOLIB || COMPILE_TEST
-       help
-         Say Y here to enable support for the I2C connected FT6x06 and
-         FT6x36 family of capacitive touchscreen drivers.
-
-         If unsure, say N.
-
-         To compile this driver as a module, choose M here: the
-         module will be called ft6236.
-
 config TOUCHSCREEN_FUJITSU
        tristate "Fujitsu serial touchscreen"
        select SERIO
@@ -405,6 +393,18 @@ config TOUCHSCREEN_GUNZE
          To compile this driver as a module, choose M here: the
          module will be called gunze.
 
+config TOUCHSCREEN_EKTF2127
+       tristate "Elan eKTF2127 I2C touchscreen"
+       depends on I2C
+       help
+         Say Y here if you have an Elan eKTF2127 touchscreen
+         connected to your system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ektf2127.
+
 config TOUCHSCREEN_ELAN
        tristate "Elan eKTH I2C touchscreen"
        depends on I2C