Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

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

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 5a8a2c91c2b22347632b572f10f9980cae8266ce..8bd44fda5eafb18a16dab40885cefa4ae900385c 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -71,6 +71,16 @@ config USB_SERIAL_ANYDATA
          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
+       help
+         Say Y here if you want to use a ARK Micro 3116 USB to Serial
+         device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ark3116
+
 config USB_SERIAL_BELKIN
        tristate "USB Belkin and Peracom Single Port Serial Driver"
        depends on USB_SERIAL
@@ -158,6 +168,15 @@ 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
@@ -398,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 devices.
+         BAY, Belkin F5U109, and Belkin F5U409 devices.
 
          To compile this driver as a module, choose M here: the
          module will be called mct_u232.
@@ -472,16 +491,22 @@ config USB_SERIAL_XIRCOM
          module will be called keyspan_pda.
 
 config USB_SERIAL_OPTION
-       tristate "USB Option PCMCIA serial driver"
-       depends on USB_SERIAL && USB_OHCI_HCD && PCCARD
+       tristate "USB driver for GSM modems"
+       depends on USB_SERIAL
        help
-         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.
+         Say Y here if you have an "Option" GSM PCMCIA card
+         (or an OEM version: branded Huawei, Audiovox, or Novatel).
+
+         These cards feature a built-in OHCI-USB adapter and an
+         internally-connected GSM modem. The USB bus is not
+         accessible externally.
 
          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