Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6] / drivers / usb / misc / Kconfig

diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index 20539cf..9c7eb61 100644 (file)
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -32,6 +32,16 @@ config USB_EMI26
          To compile this driver as a module, choose M here: the
          module will be called emi26.
 
+config USB_ADUTUX
+       tristate "ADU devices from Ontrak Control Systems (EXPERIMENTAL)"
+       depends on USB && EXPERIMENTAL
+       help
+         Say Y if you want to use an ADU device from Ontrak Control
+         Systems.
+
+         To compile this driver as a module, choose M here.  The module
+         will be called adutux.
+
 config USB_AUERSWALD
        tristate "USB Auerswald ISDN support (EXPERIMENTAL)"
        depends on USB && EXPERIMENTAL
@@ -78,6 +88,17 @@ config USB_LCD
          To compile this driver as a module, choose M here: the
          module will be called usblcd.
 
+config USB_BERRY_CHARGE
+       tristate "USB BlackBerry recharge support"
+       depends on USB
+       help
+         Say Y here if you want to connect a BlackBerry device to your
+         computer's USB port and have it automatically switch to "recharge"
+         mode.
+
+         To compile this driver as a module, choose M here: the
+         module will be called berry_charge.
+
 config USB_LED
        tristate "USB LED driver support"
        depends on USB
@@ -168,6 +189,30 @@ config USB_IDMOUSE
 
          See also <http://www.fs.tum.de/~echtler/idmouse/>.
 
+config USB_FTDI_ELAN
+       tristate "Elan PCMCIA CardBus Adapter USB Client"
+       depends on USB
+       default M
+       help
+         ELAN's Uxxx series of adapters are USB to PCMCIA CardBus adapters.
+         Currently only the U132 adapter is available.
+
+         The U132 is specifically designed for CardBus PC cards that contain
+         an OHCI host controller. Typical PC cards are the Orange Mobile 3G
+         Option GlobeTrotter Fusion card. The U132 adapter will *NOT* work
+         with PC cards that do not contain an OHCI controller. To use a U132
+         adapter you will need this "ftdi-elan" module as well as the "u132-hcd"
+         module which is a USB host controller driver that talks to the OHCI
+         controller within CardBus card that are inserted in the U132 adapter.
+
+         This driver has been tested with a CardBus OHCI USB adapter, and
+         worked with a USB PEN Drive inserted into the first USB port of
+         the PCCARD. A rather pointless thing to do, but useful for testing.
+
+         See also the USB_U132_HCD entry "Elan U132 Adapter Host Controller"
+
+         It is safe to say M here.
+
 config USB_APPLEDISPLAY
        tristate "Apple Cinema Display support"
        depends on USB
@@ -189,6 +234,30 @@ config USB_LD
          To compile this driver as a module, choose M here: the
          module will be called ldusb.
 
+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.
+
+config USB_IOWARRIOR
+       tristate "IO Warrior driver support"
+       depends on USB
+       help
+         Say Y here if you want to support the IO Warrior devices from Code
+         Mercenaries.  This includes support for the following devices:
+               IO Warrior 40
+               IO Warrior 24
+               IO Warrior 56
+               IO Warrior 24 Power Vampire
+
+         To compile this driver as a module, choose M here: the
+         module will be called iowarrior.
+
 config USB_TEST
        tristate "USB testing driver (DEVELOPMENT)"
        depends on USB && USB_DEVICEFS && EXPERIMENTAL