Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[pandora-kernel.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 6937177..e3e0baa 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -54,6 +54,19 @@ config TOUCHSCREEN_CORGI
          To compile this driver as a module, choose M here: the
          module will be called corgi_ts.
 
+config TOUCHSCREEN_FUJITSU
+       tristate "Fujitsu serial touchscreen"
+       select SERIO
+       help
+         Say Y here if you have the Fujitsu touchscreen (such as one
+         installed in Lifebook P series laptop) connected to your
+         system.
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called fujitsu-ts.
+
 config TOUCHSCREEN_GUNZE
        tristate "Gunze AHL-51S touchscreen"
        select SERIO
@@ -113,6 +126,16 @@ config TOUCHSCREEN_HP600
          To compile this driver as a module, choose M here: the
          module will be called hp680_ts_input.
 
+config TOUCHSCREEN_HP7XX
+       tristate "HP Jornada 710/720/728 touchscreen"
+       depends on SA1100_JORNADA720_SSP
+       help
+         Say Y here if you have a HP Jornada 710/720/728 and want
+         to support the built-in touchscreen.
+
+         To compile this driver as a module, choose M here: the
+         module will be called jornada720_ts.
+
 config TOUCHSCREEN_PENMOUNT
        tristate "Penmount serial touchscreen"
        select SERIO
@@ -178,6 +201,7 @@ config TOUCHSCREEN_USB_COMPOSITE
          - Gunze AHL61
          - DMC TSC-10/25
          - IRTOUCHSYSTEMS/UNITOP
+         - IdealTEK URTC1000
 
          Have a look at <http://linux.chapter7.ch/touchkit/> for
          a usage description and the required user-space stuff.
@@ -225,4 +249,14 @@ config TOUCHSCREEN_USB_IRTOUCH
        bool "IRTOUCHSYSTEMS/UNITOP device support" if EMBEDDED
        depends on TOUCHSCREEN_USB_COMPOSITE
 
+config TOUCHSCREEN_USB_IDEALTEK
+       default y
+       bool "IdealTEK URTC1000 device support" if EMBEDDED
+       depends on TOUCHSCREEN_USB_COMPOSITE
+
+config TOUCHSCREEN_USB_GENERAL_TOUCH
+       default y
+       bool "GeneralTouch Touchscreen device support" if EMBEDDED
+       depends on TOUCHSCREEN_USB_COMPOSITE
+
 endif