aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/Kconfig
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2016-10-03 16:42:21 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2016-10-03 16:42:21 -0700
commitc758f96a8c346ac5a6822b521ec92308c5774381 (patch)
tree377b72d74ee58b3e1eeb0528d0618e38645aaafc /drivers/input/touchscreen/Kconfig
parentInput: joydev - recognize devices with Z axis as joysticks (diff)
parentInput: elan_i2c - fix return tests of i2c_smbus_read_block_data() (diff)
downloadlinux-dev-c758f96a8c346ac5a6822b521ec92308c5774381.tar.xz
linux-dev-c758f96a8c346ac5a6822b521ec92308c5774381.zip
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.9 merge window.
Diffstat (limited to 'drivers/input/touchscreen/Kconfig')
-rw-r--r--drivers/input/touchscreen/Kconfig25
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 2fb1f430a431..507981356921 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -305,19 +305,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
@@ -397,6 +384,18 @@ config TOUCHSCREEN_GUNZE
To compile this driver as a module, choose M here: the
module will be called gunze.
+config TOUCHSCREEN_EKTF2127
+ tristate "Elan eKTF2127 I2C touchscreen"
+ depends on I2C
+ help
+ Say Y here if you have an Elan eKTF2127 touchscreen
+ connected to your system.
+
+ If unsure, say N.
+
+ To compile this driver as a module, choose M here: the
+ module will be called ektf2127.
+
config TOUCHSCREEN_ELAN
tristate "Elan eKTH I2C touchscreen"
depends on I2C