Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc

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

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 2f4d303ee36f927b649cbedb37f7301e3ee564af..43d6db696f905cc7361cee823ccb60d2ed99d4d6 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -423,11 +423,11 @@ config USB_SERIAL_MCT_U232
          module will be called mct_u232.
 
 config USB_SERIAL_MOS7720
          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---
        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.
 
          To compile this driver as a module, choose M here: the
          module will be called mos7720.


@@ -464,6 +464,16 @@ config USB_SERIAL_PL2303
          To compile this driver as a module, choose M here: the
          module will be called 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
 config USB_SERIAL_HP4X
         tristate "USB HP4x Calculators support"
         depends on USB_SERIAL


@@ -558,7 +568,7 @@ config USB_SERIAL_DEBUG
        tristate "USB Debugging Device"
        depends on USB_SERIAL
        help
        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.
 
          debugging data from another machine.  The most common of these
          devices is the NetChip TurboCONNECT device.