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 c3e20e5357d4f9489542efb19e585b45df68bc77..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
@@ -1061,6 +1069,7 @@ config TOUCHSCREEN_SILEAD
 config TOUCHSCREEN_SIS_I2C
        tristate "SiS 9200 family I2C touchscreen"
        depends on I2C
+       select CRC_ITU_T
        depends on GPIOLIB || COMPILE_TEST
        help
          This enables support for SiS 9200 family over I2C based touchscreens.