Merge master.kernel.org:/home/rmk/linux-2.6-arm

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

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index f5b9438..c8999ae 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -53,6 +53,15 @@ config USB_SERIAL_GENERIC
          support" be compiled as a module for this driver to be used
          properly.
 
+config USB_SERIAL_AIRCABLE
+       tristate "USB AIRcable Bluetooth Dongle Driver (EXPERIMENTAL)"
+       depends on USB_SERIAL && EXPERIMENTAL
+       help
+           Say Y here if you want to use USB AIRcable Bluetooth Dongle.
+
+           To compile this driver as a module, choose M here: the module
+           will be called aircable.
+
 config USB_SERIAL_AIRPRIME
        tristate "USB AirPrime CDMA Wireless Driver"
        depends on USB_SERIAL
@@ -161,7 +170,7 @@ config USB_SERIAL_FTDI_SIO
 
 config USB_SERIAL_FUNSOFT
        tristate "USB Fundamental Software Dongle Driver"
-       depends on USB_SERIAL
+       depends on USB_SERIAL && !(SPARC || SPARC64)
        ---help---
          Say Y here if you want to use the Fundamental Software dongle.
 
@@ -413,6 +422,31 @@ config USB_SERIAL_MCT_U232
          To compile this driver as a module, choose M here: the
          module will be called mct_u232.
 
+config USB_SERIAL_MOS7720
+       tristate "USB Moschip 7720 Single Port Serial Driver"
+       depends on USB_SERIAL
+       ---help---
+         Say Y here if you want to use a USB Serial single port adapter from
+         Moschip Semiconductor Tech.
+
+         To compile this driver as a module, choose M here: the
+         module will be called mos7720.
+
+config USB_SERIAL_MOS7840
+       tristate "USB Moschip 7840/7820 USB Serial Driver"
+       depends on USB_SERIAL
+       ---help---
+         Say Y here if you want to use a MCS7840 Quad-Serial or MCS7820
+         Dual-Serial port device from MosChip Semiconductor.
+
+         The MCS7840 and MCS7820 have been developed to connect a wide range
+         of standard serial devices to a USB host.  The MCS7840 has a USB
+         device controller connected to four (4) individual UARTs while the
+         MCS7820 controller connects to two (2) individual UARTs.
+
+         To compile this driver as a module, choose M here: the
+         module will be called mos7840.  If unsure, choose N.
+
 config USB_SERIAL_NAVMAN
        tristate "USB Navman GPS device"
        depends on USB_SERIAL
@@ -503,8 +537,7 @@ config USB_SERIAL_OPTION
          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.
+         Option, Huawei, Audiovox, Novatel Wireless, or Anydata.
 
          To compile this driver as a module, choose M here: the
          module will be called option.
@@ -521,10 +554,22 @@ config USB_SERIAL_OMNINET
          To compile this driver as a module, choose M here: the
          module will be called omninet.
 
+config USB_SERIAL_DEBUG
+       tristate "USB Debugging Device"
+       depends on USB_SERIAL
+       help
+         Say Y here if you have a USB debugging device used to recieve
+         debugging data from another machine.  The most common of these
+         devices is the NetChip TurboCONNECT device.
+
+         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