USB: Remove EXPERIMENTAL designation from USB serial/ Kconfig entries

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

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 43d6db696f905cc7361cee823ccb60d2ed99d4d6..a769f6a5d7fb439abe5ac70792e2ab02cb9e45fa 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,9 +17,11 @@ 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
+       bool "USB Serial Console device support"
+       depends on USB_SERIAL=y
        ---help---
          If you say Y here, it will be possible to use a USB to serial
          converter port as the system console (the system console is the
@@ -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
@@ -54,8 +59,8 @@ config USB_SERIAL_GENERIC
          properly.
 
 config USB_SERIAL_AIRCABLE
-       tristate "USB AIRcable Bluetooth Dongle Driver (EXPERIMENTAL)"
-       depends on USB_SERIAL && EXPERIMENTAL
+       tristate "USB AIRcable Bluetooth Dongle Driver"
+       depends on USB_SERIAL
        help
            Say Y here if you want to use USB AIRcable Bluetooth Dongle.
 
@@ -72,8 +77,8 @@ config USB_SERIAL_AIRPRIME
          module will be called airprime.
 
 config USB_SERIAL_ARK3116
-       tristate "USB ARK Micro 3116 USB Serial Driver (EXPERIMENTAL)"
-       depends on USB_SERIAL && EXPERIMENTAL
+       tristate "USB ARK Micro 3116 USB Serial Driver"
+       depends on USB_SERIAL
        help
          Say Y here if you want to use a ARK Micro 3116 USB to Serial
          device.
@@ -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.
@@ -119,7 +135,7 @@ config USB_SERIAL_DIGI_ACCELEPORT
 
 config USB_SERIAL_CP2101
        tristate "USB CP2101 UART Bridge Controller"
-       depends on USB_SERIAL && EXPERIMENTAL
+       depends on USB_SERIAL
        help
          Say Y here if you want to use a CP2101/CP2102 based USB to RS232
          converter.
@@ -129,7 +145,7 @@ config USB_SERIAL_CP2101
 
 config USB_SERIAL_CYPRESS_M8
        tristate "USB Cypress M8 USB Serial Driver"
-       depends on USB_SERIAL && EXPERIMENTAL
+       depends on USB_SERIAL
        help
          Say Y here if you want to use a device that contains the Cypress
          USB to Serial microcontroller, such as the DeLorme Earthmate GPS.
@@ -155,8 +171,8 @@ config USB_SERIAL_EMPEG
          module will be called empeg.
 
 config USB_SERIAL_FTDI_SIO
-       tristate "USB FTDI Single Port Serial Driver (EXPERIMENTAL)"
-       depends on USB_SERIAL && EXPERIMENTAL
+       tristate "USB FTDI Single Port Serial Driver"
+       depends on USB_SERIAL
        ---help---
          Say Y here if you want to use a FTDI SIO single port USB to serial
          converter device. The implementation I have is called the USC-1000.
@@ -202,8 +218,8 @@ config USB_SERIAL_IPAQ
          module will be called ipaq.
 
 config USB_SERIAL_IR
-       tristate "USB IR Dongle Serial Driver (EXPERIMENTAL)"
-       depends on USB_SERIAL && EXPERIMENTAL
+       tristate "USB IR Dongle Serial Driver"
+       depends on USB_SERIAL
        help
          Say Y here if you want to enable simple serial support for USB IrDA
          devices.  This is useful if you do not want to use the full IrDA
@@ -263,8 +279,8 @@ config USB_SERIAL_GARMIN
          module will be called garmin_gps.
 
 config USB_SERIAL_IPW
-        tristate "USB IPWireless (3G UMTS TDD) Driver (EXPERIMENTAL)"
-       depends on USB_SERIAL && EXPERIMENTAL
+        tristate "USB IPWireless (3G UMTS TDD) Driver"
+       depends on USB_SERIAL
        help
          Say Y here if you want to use a IPWireless USB modem such as
          the ones supplied by Axity3G/Sentech South Africa.
@@ -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"
+       depends on USB_SERIAL
+       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
@@ -376,8 +405,8 @@ config USB_SERIAL_KEYSPAN_USA49WLC
          Say Y here to include firmware for the USA-49WLC converter.
 
 config USB_SERIAL_KLSI
-       tristate "USB KL5KUSB105 (Palmconnect) Driver (EXPERIMENTAL)"
-       depends on USB_SERIAL && EXPERIMENTAL
+       tristate "USB KL5KUSB105 (Palmconnect) Driver"
+       depends on USB_SERIAL
        ---help---
          Say Y here if you want to use a KL5KUSB105 - based single port
          serial adapter. The most widely known -- and currently the only
@@ -465,7 +494,7 @@ config USB_SERIAL_PL2303
          module will be called pl2303.
 
 config USB_SERIAL_OTI6858
-       tristate "USB Ours Technology Inc. OTi-6858 USB To RS232 Bridge Controller (EXPERIMENTAL)"
+       tristate "USB Ours Technology Inc. OTi-6858 USB To RS232 Bridge Controller"
        depends on USB_SERIAL
        help
          Say Y here if you want to use the OTi-6858 single port USB to serial
@@ -484,8 +513,8 @@ config USB_SERIAL_HP4X
           module will be called hp4x.
 
 config USB_SERIAL_SAFE
-       tristate "USB Safe Serial (Encapsulated) Driver (EXPERIMENTAL)"
-       depends on USB_SERIAL && EXPERIMENTAL
+       tristate "USB Safe Serial (Encapsulated) Driver"
+       depends on USB_SERIAL
 
 config USB_SERIAL_SAFE_PADDED
        bool "USB Secure Encapsulated Driver - Padded"
@@ -513,11 +542,11 @@ config USB_SERIAL_TI
          module will be called ti_usb_3410_5052.
 
 config USB_SERIAL_CYBERJACK
-       tristate "USB REINER SCT cyberJack pinpad/e-com chipcard reader (EXPERIMENTAL)"
-       depends on USB_SERIAL && EXPERIMENTAL
+       tristate "USB REINER SCT cyberJack pinpad/e-com chipcard reader"
+       depends on USB_SERIAL
        ---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
@@ -528,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
@@ -556,8 +586,8 @@ config USB_SERIAL_OPTION
          it might be accessible via the FTDI_SIO driver.
 
 config USB_SERIAL_OMNINET
-       tristate "USB ZyXEL omni.net LCD Plus Driver (EXPERIMENTAL)"
-       depends on USB_SERIAL && EXPERIMENTAL
+       tristate "USB ZyXEL omni.net LCD Plus Driver"
+       depends on USB_SERIAL
        help
          Say Y here if you want to use a ZyXEL omni.net LCD ISDN TA.
 
@@ -575,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