Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / drivers / usb / input / Kconfig

diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 7ec35c90d2d739bbe381b06c47997bc85712a908..21cd22640080fbce6d032354409f59dc61de32a3 100644 (file)
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -215,10 +215,12 @@ config USB_TOUCHSCREEN
        depends on USB && INPUT
        ---help---
          USB Touchscreen driver for:
-         - eGalax Touchkit USB
+         - eGalax Touchkit USB (also includes eTurboTouch CT-410/510/700)
          - PanJit TouchSet USB
-         - 3M MicroTouch USB
+         - 3M MicroTouch USB (EX II series)
          - ITM
+         - some other eTurboTouch
+         - Gunze AHL61
 
          Have a look at <http://linux.chapter7.ch/touchkit/> for
          a usage description and the required user-space stuff.
@@ -228,7 +230,7 @@ config USB_TOUCHSCREEN
 
 config USB_TOUCHSCREEN_EGALAX
        default y
-       bool "eGalax device support" if EMBEDDED
+       bool "eGalax, eTurboTouch CT-410/510/700 device support" if EMBEDDED
        depends on USB_TOUCHSCREEN
 
 config USB_TOUCHSCREEN_PANJIT
@@ -238,7 +240,7 @@ config USB_TOUCHSCREEN_PANJIT
 
 config USB_TOUCHSCREEN_3M
        default y
-       bool "3M/Microtouch device support" if EMBEDDED
+       bool "3M/Microtouch EX II series device support" if EMBEDDED
        depends on USB_TOUCHSCREEN
 
 config USB_TOUCHSCREEN_ITM
@@ -246,6 +248,16 @@ config USB_TOUCHSCREEN_ITM
        bool "ITM device support" if EMBEDDED
        depends on USB_TOUCHSCREEN
 
+config USB_TOUCHSCREEN_ETURBO
+       default y
+       bool "eTurboTouch (non-eGalax compatible) device support" if EMBEDDED
+       depends on USB_TOUCHSCREEN
+
+config USB_TOUCHSCREEN_GUNZE
+       default y
+       bool "Gunze AHL61 device support" if EMBEDDED
+       depends on USB_TOUCHSCREEN
+
 config USB_YEALINK
        tristate "Yealink usb-p1k voip phone"
        depends on USB && INPUT && EXPERIMENTAL
@@ -336,3 +348,13 @@ config USB_APPLETOUCH
 
          To compile this driver as a module, choose M here: the
          module will be called appletouch.
+
+config USB_TRANCEVIBRATOR
+       tristate "PlayStation 2 Trance Vibrator driver support"
+       depends on USB
+       help
+         Say Y here if you want to connect a PlayStation 2 Trance Vibrator
+         device to your computer's USB port.
+
+         To compile this driver as a module, choose M here: the
+         module will be called trancevibrator.