Merge remote-tracking branch 'input/next'

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

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 2fb1f430a4318fcddf65a85a813aae96861da09c..fce1e41ffe8b040d143bc9c03ea0931e719a3bec 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -115,6 +115,14 @@ config TOUCHSCREEN_ATMEL_MXT
          To compile this driver as a module, choose M here: the
          module will be called atmel_mxt_ts.
 
+config TOUCHSCREEN_ATMEL_MXT_T37
+       bool "Support T37 Diagnostic Data"
+       depends on TOUCHSCREEN_ATMEL_MXT && VIDEO_V4L2
+       select VIDEOBUF2_VMALLOC
+       help
+         Say Y here if you want support to output data from the T37
+         Diagnostic Data object using a V4L device.
+
 config TOUCHSCREEN_AUO_PIXCIR
        tristate "AUO in-cell touchscreen using Pixcir ICs"
        depends on I2C
@@ -305,19 +313,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