Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[linux-2.6] / drivers / usb / serial / Kconfig

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index c8999ae586520f4f621a56892f4818375666f3ef..99fefed77919de2dbd28af6de48faa1080181924 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -92,6 +92,16 @@ config USB_SERIAL_BELKIN
          To compile this driver as a module, choose M here: the
          module will be called belkin_sa.
 
+config USB_SERIAL_CH341
+       tristate "USB Winchiphead CH341 Single Port Serial Driver"
+       depends on USB_SERIAL
+       help
+         Say Y here if you want to use a Winchiphead CH341 single port
+         USB to serial adapter.
+
+         To compile this driver as a module, choose M here: the
+         module will be called ch341.
+
 config USB_SERIAL_WHITEHEAT
        tristate "USB ConnectTech WhiteHEAT Serial Driver"
        depends on USB_SERIAL
@@ -170,7 +180,7 @@ config USB_SERIAL_FTDI_SIO
 
 config USB_SERIAL_FUNSOFT
        tristate "USB Fundamental Software Dongle Driver"
-       depends on USB_SERIAL && !(SPARC || SPARC64)
+       depends on USB_SERIAL
        ---help---
          Say Y here if you want to use the Fundamental Software dongle.
 
@@ -423,11 +433,11 @@ config USB_SERIAL_MCT_U232
          module will be called mct_u232.
 
 config USB_SERIAL_MOS7720
-       tristate "USB Moschip 7720 Single Port Serial Driver"
+       tristate "USB Moschip 7720 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.
+         Say Y here if you want to use USB Serial single and double
+         port adapters from Moschip Semiconductor Tech.
 
          To compile this driver as a module, choose M here: the
          module will be called mos7720.
@@ -464,6 +474,16 @@ config USB_SERIAL_PL2303
          To compile this driver as a module, choose M here: the
          module will be called pl2303.
 
+config USB_SERIAL_OTI6858
+       tristate "USB Ours Technology Inc. OTi-6858 USB To RS232 Bridge Controller (EXPERIMENTAL)"
+       depends on USB_SERIAL
+       help
+         Say Y here if you want to use the OTi-6858 single port USB to serial
+          converter device.
+
+         To compile this driver as a module, choose M here: the
+         module will be called oti6858.
+
 config USB_SERIAL_HP4X
         tristate "USB HP4x Calculators support"
         depends on USB_SERIAL
@@ -558,7 +578,7 @@ 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
+         Say Y here if you have a USB debugging device used to receive
          debugging data from another machine.  The most common of these
          devices is the NetChip TurboCONNECT device.