Merge branch develop-3.10

[firefly-linux-kernel-4.4.55.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index e02122203a969f0cdc16b2c1565989f0fa3d3d7e..45787d918a33627114c73483dc39e72dc1730334 100755 (executable)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -17,6 +17,11 @@ config TOUCHSCREEN_ZET62XX
                zet62xx touchscreen driver
 
 
+config TOUCHSCREEN_GSLX680
+       tristate "gslX680 touchscreen driver"
+       help
+               gslX680 touchscreen driver
+
 config TOUCHSCREEN_GT8XX
        tristate "Goodix touch screen gt801X2 support for rockchip based platform"
        help
@@ -25,6 +30,14 @@ config TOUCHSCREEN_GT8XX
          code includes that in its table of IIC devices.
          If unsure, say N.
 
+config TOUCHSCREEN_GT9XX
+       tristate "Goodix touch screen gt9xx support for rockchip based platform"
+       help
+         Say Y here if you have a touchscreen interface using the
+         two goodix gt9xx, and your board-specific initialization
+         code includes that in its table of IIC devices.
+         If unsure, say N.
+
 config TOUCHSCREEN_CT36X_TS
        tristate "CT36X touchscreens support"