Merge branch 'next' into for-linus

Prepare first round of input updates for 4.3 merge window.

1 files changed, 24 insertions, 0 deletions

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index deb14c12ae8b..80cc69897a43 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -295,6 +295,19 @@ config TOUCHSCREEN_EGALAX
           To compile this driver as a module, choose M here: the
           module will be called egalax_ts.
 
+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
@@ -1065,4 +1078,15 @@ config TOUCHSCREEN_COLIBRI_VF50
           To compile this driver as a module, choose M here: the
           module will be called colibri_vf50_ts.
 
+config TOUCHSCREEN_ROHM_BU21023
+        tristate "ROHM BU21023/24 Dual touch support resistive touchscreens"
+        depends on I2C
+        help
+          Say Y here if you have a touchscreen using ROHM BU21023/24.
+
+          If unsure, say N.
+
+          To compile this driver as a module, choose M here: the
+          module will be called bu21023_ts.
+
 endif