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 5076b9d..c8999ae 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -54,10 +54,10 @@ config USB_SERIAL_GENERIC
          properly.
 
 config USB_SERIAL_AIRCABLE
-       tristate "AIRcable USB Bluetooth Dongle Driver (EXPERIMENTAL)"
+       tristate "USB AIRcable Bluetooth Dongle Driver (EXPERIMENTAL)"
        depends on USB_SERIAL && EXPERIMENTAL
        help
-           Say Y here if you want to use AIRcable USB Bluetoot Dongle.
+           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.
@@ -170,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.
 
@@ -422,6 +422,16 @@ 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
@@ -527,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.
@@ -545,6 +554,17 @@ 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