Merge branch 'upstream-fixes' into upstream

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

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 8bd44fd..f5b9438 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -62,15 +62,6 @@ config USB_SERIAL_AIRPRIME
          To compile this driver as a module, choose M here: the
          module will be called airprime.
 
-config USB_SERIAL_ANYDATA
-       tristate "USB AnyData CDMA Wireless Driver"
-       depends on USB_SERIAL
-       help
-         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 anydata.
-
 config USB_SERIAL_ARK3116
        tristate "USB ARK Micro 3116 USB Serial Driver (EXPERIMENTAL)"
        depends on USB_SERIAL && EXPERIMENTAL
@@ -456,6 +447,17 @@ 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
@@ -491,15 +493,18 @@ config USB_SERIAL_XIRCOM
          module will be called keyspan_pda.
 
 config USB_SERIAL_OPTION
-       tristate "USB driver for GSM modems"
+       tristate "USB driver for GSM and CDMA modems"
        depends on USB_SERIAL
        help
-         Say Y here if you have an "Option" GSM PCMCIA card
-         (or an OEM version: branded Huawei, Audiovox, or Novatel).
+         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.
 
-         These cards feature a built-in OHCI-USB adapter and an
-         internally-connected GSM modem. The USB bus is not
-         accessible externally.
+         Supported devices include (some of?) those made by:
+         Option, Huawei, Audiovox, Sierra Wireless, Novatel Wireless, or
+         Anydata.
 
          To compile this driver as a module, choose M here: the
          module will be called option.