Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / input / touchscreen / Kconfig

diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 80176f1b42303e62b7b14f5dfff089c427514142..f3c45b604ebed571d276d4153b278db1203f105a 100644 (file)
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -115,17 +115,25 @@ config TOUCHSCREEN_MK712
          module will be called mk712.
 
 config TOUCHSCREEN_HP600
-       tristate "HP Jornada 680/690 touchscreen"
+       tristate "HP Jornada 6xx touchscreen"
        depends on SH_HP6XX && SH_ADC
        help
-         Say Y here if you have a HP Jornada 680 or 690 and want to
+         Say Y here if you have a HP Jornada 620/660/680/690 and want to
           support the built-in touchscreen.
 
-         If unsure, say N.
-
          To compile this driver as a module, choose M here: the
          module will be called hp680_ts_input.
 
+config TOUCHSCREEN_HP7XX
+       tristate "HP Jornada 7xx 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
@@ -226,6 +234,8 @@ config TOUCHSCREEN_USB_COMPOSITE
          - Gunze AHL61
          - DMC TSC-10/25
          - IRTOUCHSYSTEMS/UNITOP
+         - IdealTEK URTC1000
+         - GoTop Super_Q2/GogoPen/PenPower tablets
 
          Have a look at <http://linux.chapter7.ch/touchkit/> for
          a usage description and the required user-space stuff.
@@ -273,4 +283,19 @@ 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
+
+config TOUCHSCREEN_USB_GOTOP
+       default y
+       bool "GoTop Super_Q2/GogoPen/PenPower tablet device support" if EMBEDDED
+       depends on TOUCHSCREEN_USB_COMPOSITE
+
 endif