Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev

[karo-tx-linux.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 87a1ae63bcc4221317dc9d7355cab481eff2e13c..8cc453c85ea704d42ee8411d232c31193e8212e1 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -48,8 +48,8 @@ config TOUCHSCREEN_AD7879_I2C
        select TOUCHSCREEN_AD7879
        help
          Say Y here if you have a touchscreen interface using the
-         AD7879-1 controller, and your board-specific initialization
-         code includes that in its table of I2C devices.
+         AD7879-1/AD7889-1 controller, and your board-specific
+         initialization code includes that in its table of I2C devices.
 
          If unsure, say N (but it's safe to say "Y").
 
@@ -62,7 +62,7 @@ config TOUCHSCREEN_AD7879_SPI
        select TOUCHSCREEN_AD7879
        help
          Say Y here if you have a touchscreen interface using the
-         AD7879 controller, and your board-specific initialization
+         AD7879/AD7889 controller, and your board-specific initialization
          code includes that in its table of SPI devices.
 
          If unsure, say N (but it's safe to say "Y").
@@ -169,6 +169,17 @@ config TOUCHSCREEN_WACOM_W8001
          To compile this driver as a module, choose M here: the
          module will be called wacom_w8001.
 
+config TOUCHSCREEN_MCS5000
+       tristate "MELFAS MCS-5000 touchscreen"
+       depends on I2C
+       help
+         Say Y here if you have the MELFAS MCS-5000 touchscreen controller
+         chip in your system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called mcs5000_ts.
 
 config TOUCHSCREEN_MTOUCH
        tristate "MicroTouch serial touchscreens"
@@ -510,4 +521,13 @@ config TOUCHSCREEN_W90X900
          To compile this driver as a module, choose M here: the
          module will be called w90p910_ts.
 
+config TOUCHSCREEN_PCAP
+       tristate "Motorola PCAP touchscreen"
+       depends on EZX_PCAP
+       help
+         Say Y here if you have a Motorola EZX telephone and
+         want to enable support for the built-in touchscreen.
+
+         To compile this driver as a module, choose M here: the
+         module will be called pcap_ts.
 endif