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 754e6aa0851dfb5e77009d412896bda5b094ce42..fce1e41ffe8b040d143bc9c03ea0931e719a3bec 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -313,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