Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / drivers / usb / input / Kconfig

diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 83b90be..a102a58 100644 (file)
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -205,10 +205,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.
@@ -218,7 +220,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
@@ -228,7 +230,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
@@ -236,45 +238,15 @@ config USB_TOUCHSCREEN_ITM
        bool "ITM device support" if EMBEDDED
        depends on USB_TOUCHSCREEN
 
-config USB_MTOUCH
-       tristate "MicroTouch USB Touchscreen Driver"
-       depends on USB && INPUT && !USB_TOUCHSCREEN_3M
-       ---help---
-         Say Y here if you want to use a MicroTouch (Now 3M) USB 
-         Touchscreen controller.
-
-         See <file:Documentation/usb/mtouch.txt> for additional information.
-
-         To compile this driver as a module, choose M here: the
-         module will be called mtouchusb.
-
-config USB_ITMTOUCH
-       tristate "ITM Touch USB Touchscreen Driver"
-       depends on USB && INPUT && !USB_TOUCHSCREEN_ITM
-       ---help---
-         Say Y here if you want to use a ITM Touch USB
-         Touchscreen controller.
-
-         This touchscreen is used in LG 1510SF monitors.
-
-         To compile this driver as a module, choose M here: the
-         module will be called itmtouch.
-
-config USB_EGALAX
-       tristate "eGalax TouchKit USB Touchscreen Driver"
-       depends on USB && INPUT && !USB_TOUCHSCREEN_EGALAX
-       ---help---
-         Say Y here if you want to use a eGalax TouchKit USB
-         Touchscreen controller.
-
-         The driver has been tested on a Xenarc 700TSV monitor
-         with eGalax touchscreen.
-
-         Have a look at <http://linux.chapter7.ch/touchkit/> for
-         a usage description and the required user-space stuff.
+config USB_TOUCHSCREEN_ETURBO
+       default y
+       bool "eTurboTouch (non-eGalax compatible) device support" if EMBEDDED
+       depends on USB_TOUCHSCREEN
 
-         To compile this driver as a module, choose M here: the
-         module will be called touchkitusb.
+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"
@@ -366,3 +338,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.