Merge branch 'linus' into x86/cleanups

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

diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
index 4907e8b8007087b37a3141135312acd43b2b4f90..001789c9a11a7c6b0e0c531ed4ede55fa77cb361 100644 (file)
--- a/drivers/usb/misc/Kconfig
+++ b/drivers/usb/misc/Kconfig
@@ -33,8 +33,8 @@ config USB_EMI26
          module will be called emi26.
 
 config USB_ADUTUX
-       tristate "ADU devices from Ontrak Control Systems (EXPERIMENTAL)"
-       depends on USB && EXPERIMENTAL
+       tristate "ADU devices from Ontrak Control Systems"
+       depends on USB
        help
          Say Y if you want to use an ADU device from Ontrak Control
          Systems.
@@ -43,8 +43,8 @@ config USB_ADUTUX
          will be called adutux.
 
 config USB_AUERSWALD
-       tristate "USB Auerswald ISDN support (EXPERIMENTAL)"
-       depends on USB && EXPERIMENTAL
+       tristate "USB Auerswald ISDN support"
+       depends on USB
        help
          Say Y here if you want to connect an Auerswald USB ISDN Device
          to your computer's USB port.
@@ -53,8 +53,8 @@ config USB_AUERSWALD
          module will be called auerswald.
 
 config USB_RIO500
-       tristate "USB Diamond Rio500 support (EXPERIMENTAL)"
-       depends on USB && EXPERIMENTAL
+       tristate "USB Diamond Rio500 support"
+       depends on USB
        help
          Say Y here if you want to connect a USB Rio500 mp3 player to your
          computer's USB port. Please read <file:Documentation/usb/rio.txt>
@@ -64,8 +64,8 @@ config USB_RIO500
          module will be called rio500.
 
 config USB_LEGOTOWER
-       tristate "USB Lego Infrared Tower support (EXPERIMENTAL)"
-       depends on USB && EXPERIMENTAL
+       tristate "USB Lego Infrared Tower support"
+       depends on USB
        help
          Say Y here if you want to connect a USB Lego Infrared Tower to your
          computer's USB port.
@@ -244,9 +244,23 @@ config USB_TRANCEVIBRATOR
          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
+       tristate "USB testing driver"
+       depends on USB && USB_DEVICEFS
        help
          This driver is for testing host controller software.  It is used
          with specialized device firmware for regression and stress testing,
@@ -255,3 +269,15 @@ config USB_TEST
          See <http://www.linux-usb.org/usbtest/> for more information,
          including sample test device firmware and "how to use it".
 
+config USB_ISIGHTFW
+       tristate "iSight firmware loading support"
+       depends on USB
+       select FW_LOADER
+       help
+         This driver loads firmware for USB Apple iSight cameras, allowing
+         them to be driven by the USB video class driver available at
+         http://linux-uvc.berlios.de
+
+         The firmware for this driver must be extracted from the MacOS
+         driver beforehand. Tools for doing so are available at
+         http://bersace03.free.fr