Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release

[pandora-kernel.git] / drivers / usb / serial / Kconfig

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 3efe670..c1e65df 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -2,10 +2,7 @@
 # USB Serial device configuration
 #
 
-menu "USB Serial Converter support"
-       depends on USB!=n
-
-config USB_SERIAL
+menuconfig USB_SERIAL
        tristate "USB Serial Converter support"
        depends on USB
        ---help---
@@ -20,6 +17,8 @@ config USB_SERIAL
          To compile this driver as a module, choose M here: the
          module will be called usbserial.
 
+if USB_SERIAL
+
 config USB_SERIAL_CONSOLE
        bool "USB Serial Console device support (EXPERIMENTAL)"
        depends on USB_SERIAL=y && EXPERIMENTAL
@@ -43,6 +42,12 @@ config USB_SERIAL_CONSOLE
 
          If unsure, say N.
 
+config USB_EZUSB
+       bool "Functions for loading firmware on EZUSB chips"
+       depends on USB_SERIAL
+       help
+           Say Y here if you need EZUSB device support.
+
 config USB_SERIAL_GENERIC
        bool "USB Generic Serial Driver"
        depends on USB_SERIAL
@@ -92,9 +97,20 @@ config USB_SERIAL_BELKIN
          To compile this driver as a module, choose M here: the
          module will be called belkin_sa.
 
+config USB_SERIAL_CH341
+       tristate "USB Winchiphead CH341 Single Port Serial Driver"
+       depends on USB_SERIAL
+       help
+         Say Y here if you want to use a Winchiphead CH341 single port
+         USB to serial adapter.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ch341.
+
 config USB_SERIAL_WHITEHEAT
        tristate "USB ConnectTech WhiteHEAT Serial Driver"
        depends on USB_SERIAL
+       select USB_EZUSB
        help
          Say Y here if you want to use a ConnectTech WhiteHEAT 4 port
          USB to serial converter device.
@@ -272,9 +288,21 @@ config USB_SERIAL_IPW
          To compile this driver as a module, choose M here: the
          module will be called ipw.
 
+config USB_SERIAL_IUU
+       tristate "USB Infinity USB Unlimited Phoenix Driver (Experimental)"
+       depends on USB_SERIAL && EXPERIMENTAL
+       help
+         Say Y here if you want to use a IUU in phoenix mode and get
+         an extra ttyUSBx device. More information available on
+         http://eczema.ecze.com/iuu_phoenix.html
+
+         To compile this driver as a module, choose M here: the
+         module will be called iuu_phoenix.o
+
 config USB_SERIAL_KEYSPAN_PDA
        tristate "USB Keyspan PDA Single Port Serial Driver"
        depends on USB_SERIAL
+       select USB_EZUSB
        help
          Say Y here if you want to use a Keyspan PDA single port USB to
          serial converter device.  This driver makes use of firmware
@@ -286,6 +314,7 @@ config USB_SERIAL_KEYSPAN_PDA
 config USB_SERIAL_KEYSPAN
        tristate "USB Keyspan USA-xxx Serial Driver"
        depends on USB_SERIAL
+       select USB_EZUSB
        ---help---
          Say Y here if you want to use Keyspan USB to serial converter
          devices.  This driver makes use of Keyspan's official firmware
@@ -464,6 +493,16 @@ config USB_SERIAL_PL2303
          To compile this driver as a module, choose M here: the
          module will be called pl2303.
 
+config USB_SERIAL_OTI6858
+       tristate "USB Ours Technology Inc. OTi-6858 USB To RS232 Bridge Controller (EXPERIMENTAL)"
+       depends on USB_SERIAL
+       help
+         Say Y here if you want to use the OTi-6858 single port USB to serial
+          converter device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called oti6858.
+
 config USB_SERIAL_HP4X
         tristate "USB HP4x Calculators support"
         depends on USB_SERIAL
@@ -507,7 +546,7 @@ config USB_SERIAL_CYBERJACK
        depends on USB_SERIAL && EXPERIMENTAL
        ---help---
          Say Y here if you want to use a cyberJack pinpad/e-com USB chipcard
-         reader. This is an interface to ISO 7816 compatible contactbased
+         reader. This is an interface to ISO 7816 compatible contact-based
          chipcards, e.g. GSM SIMs.
 
          To compile this driver as a module, choose M here: the
@@ -518,6 +557,7 @@ config USB_SERIAL_CYBERJACK
 config USB_SERIAL_XIRCOM
        tristate "USB Xircom / Entregra Single Port Serial Driver"
        depends on USB_SERIAL
+       select USB_EZUSB
        help
          Say Y here if you want to use a Xircom or Entregra single port USB to
          serial converter device.  This driver makes use of firmware
@@ -565,11 +605,4 @@ config USB_SERIAL_DEBUG
          To compile this driver as a module, choose M here: the
          module will be called usb-debug.
 
-config USB_EZUSB
-       bool
-       depends on USB_SERIAL_KEYSPAN_PDA || USB_SERIAL_XIRCOM || USB_SERIAL_KEYSPAN || USB_SERIAL_WHITEHEAT
-       default y
-
-
-endmenu
-
+endif # USB_SERIAL