X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fusb%2Fserial%2FKconfig;h=5c60be521561a5fdeed21d5bd4df5a37b5a9ee9b;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=f5b9438c94f0f29bd35392906b59759420ebad44;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index f5b9438c9..5c60be521 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -62,6 +62,15 @@ 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
@@ -408,7 +417,7 @@ 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.
@@ -447,17 +456,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 +491,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