linux 2.6.16.38 w/ vs2.0.3-rc1

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

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index f5b9438..be5dc80 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -62,15 +62,14 @@ config USB_SERIAL_AIRPRIME
          To compile this driver as a module, choose M here: the
          module will be called airprime.
 
-config USB_SERIAL_ARK3116
-       tristate "USB ARK Micro 3116 USB Serial Driver (EXPERIMENTAL)"
-       depends on USB_SERIAL && EXPERIMENTAL
+config USB_SERIAL_ANYDATA
+       tristate "USB AnyData CDMA Wireless Driver"
+       depends on USB_SERIAL
        help
-         Say Y here if you want to use a ARK Micro 3116 USB to Serial
-         device.
+         Say Y here if you want to use a AnyData CDMA device.
 
          To compile this driver as a module, choose M here: the
-         module will be called ark3116
+         module will be called anydata.
 
 config USB_SERIAL_BELKIN
        tristate "USB Belkin and Peracom Single Port Serial Driver"
@@ -159,15 +158,6 @@ config USB_SERIAL_FTDI_SIO
          To compile this driver as a module, choose M here: the
          module will be called ftdi_sio.
 
-config USB_SERIAL_FUNSOFT
-       tristate "USB Fundamental Software Dongle Driver"
-       depends on USB_SERIAL
-       ---help---
-         Say Y here if you want to use the Fundamental Software dongle.
-
-         To compile this driver as a module, choose M here: the
-         module will be called funsoft.
-
 config USB_SERIAL_VISOR
        tristate "USB Handspring Visor / Palm m50x / Sony Clie Driver"
        depends on USB_SERIAL
@@ -408,18 +398,11 @@ config USB_SERIAL_MCT_U232
          Magic Control Technology Corp. (U232 is one of the model numbers).
 
          This driver also works with Sitecom U232-P25 and D-Link DU-H3SP USB
-         BAY, Belkin F5U109, and Belkin F5U409 devices.
+         BAY devices.
 
          To compile this driver as a module, choose M here: the
          module will be called mct_u232.
 
-config USB_SERIAL_NAVMAN
-       tristate "USB Navman GPS device"
-       depends on USB_SERIAL
-       help
-         To compile this driver as a module, choose M here: the
-         module will be called navman.
-
 config USB_SERIAL_PL2303
        tristate "USB Prolific 2303 Single Port Serial Driver"
        depends on USB_SERIAL
@@ -447,17 +430,6 @@ config USB_SERIAL_SAFE_PADDED
        bool "USB Secure Encapsulated Driver - Padded"
        depends on USB_SERIAL_SAFE
 
-config USB_SERIAL_SIERRAWIRELESS
-       tristate "USB Sierra Wireless Driver"
-       depends on USB_SERIAL
-       help
-         Say M here if you want to use a Sierra Wireless device (if
-         using an PC 5220 or AC580 please use the Airprime driver
-         instead).
-
-         To compile this driver as a module, choose M here: the
-         module will be called sierra.
-
 config USB_SERIAL_TI
        tristate "USB TI 3410/5052 Serial Driver"
        depends on USB_SERIAL
@@ -493,25 +465,16 @@ config USB_SERIAL_XIRCOM
          module will be called keyspan_pda.
 
 config USB_SERIAL_OPTION
-       tristate "USB driver for GSM and CDMA modems"
-       depends on USB_SERIAL
+       tristate "USB Option PCMCIA serial driver"
+       depends on USB_SERIAL && USB_OHCI_HCD && PCCARD
        help
-         Say Y here if you have a GSM or CDMA modem that's connected to USB.
-
-         This driver also supports several PCMCIA cards which have a
-         built-in OHCI-USB adapter and an internally-connected GSM modem.
-         The USB bus on these cards is not accessible externally.
-
-         Supported devices include (some of?) those made by:
-         Option, Huawei, Audiovox, Sierra Wireless, Novatel Wireless, or
-         Anydata.
+         Say Y here if you want to use an Option card. This is a
+         GSM card, controlled by three serial ports which are connected
+         via an OHCI adapter located on a PC card.
 
          To compile this driver as a module, choose M here: the
          module will be called option.
 
-         If this driver doesn't recognize your device,
-         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