- Update to 3.3-rc2.

[linux-flexiantxendom0-3.2.10.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 6590b0e..6b8e3c6 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -98,6 +98,19 @@ config TOUCHSCREEN_ATMEL_MXT
          To compile this driver as a module, choose M here: the
          module will be called atmel_mxt_ts.
 
+config TOUCHSCREEN_AUO_PIXCIR
+       tristate "AUO in-cell touchscreen using Pixcir ICs"
+       depends on I2C
+       depends on GPIOLIB
+       help
+         Say Y here if you have a AUO display with in-cell touchscreen
+         using Pixcir ICs.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called auo-pixcir-ts.
+
 config TOUCHSCREEN_BITSY
        tristate "Compaq iPAQ H3600 (Bitsy) touchscreen"
        depends on SA1100_BITSY
@@ -177,6 +190,16 @@ config TOUCHSCREEN_EETI
          To compile this driver as a module, choose M here: the
          module will be called eeti_ts.
 
+config TOUCHSCREEN_EGALAX
+       tristate "EETI eGalax multi-touch panel support"
+       depends on I2C
+       help
+         Say Y here to enable support for I2C connected EETI
+         eGalax multi-touch panels.
+
+         To compile this driver as a module, choose M here: the
+         module will be called egalax_ts.
+
 config TOUCHSCREEN_FUJITSU
        tristate "Fujitsu serial touchscreen"
        select SERIO
@@ -447,6 +470,18 @@ config TOUCHSCREEN_UCB1400
          To compile this driver as a module, choose M here: the
          module will be called ucb1400_ts.
 
+config TOUCHSCREEN_PIXCIR
+       tristate "PIXCIR I2C touchscreens"
+       depends on I2C
+       help
+         Say Y here if you have a pixcir i2c touchscreen
+         controller.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called pixcir_i2c_ts.
+
 config TOUCHSCREEN_WM831X
        tristate "Support for WM831x touchscreen controllers"
        depends on MFD_WM831X
@@ -553,6 +588,7 @@ config TOUCHSCREEN_USB_COMPOSITE
          - GoTop Super_Q2/GogoPen/PenPower tablets
          - JASTEC USB Touch Controller/DigiTech DTR-02U
          - Zytronic controllers
+         - Elo TouchSystems 2700 IntelliTouch
 
          Have a look at <http://linux.chapter7.ch/touchkit/> for
          a usage description and the required user-space stuff.
@@ -632,6 +668,11 @@ config TOUCHSCREEN_USB_JASTEC
        bool "JASTEC/DigiTech DTR-02U USB touch controller device support" if EXPERT
        depends on TOUCHSCREEN_USB_COMPOSITE
 
+config TOUCHSCREEN_USB_ELO
+       default y
+       bool "Elo TouchSystems 2700 IntelliTouch controller device support" if EXPERT
+       depends on TOUCHSCREEN_USB_COMPOSITE
+
 config TOUCHSCREEN_USB_E2I
        default y
        bool "e2i Touchscreen controller (e.g. from Mimo 740)"