Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

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

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 3efe67092f15b85c1db4c4a145b83a79270789e6..4a86696e6c7dd20240aca1776139669c9ac4005c 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
@@ -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
@@ -507,7 +527,7 @@ config USB_SERIAL_CYBERJACK
        depends on USB_SERIAL && EXPERIMENTAL
        ---help---
          Say Y here if you want to use a cyberJack pinpad/e-com USB chipcard
-         reader. This is an interface to ISO 7816 compatible contactbased
+         reader. This is an interface to ISO 7816 compatible contact-based
          chipcards, e.g. GSM SIMs.
 
          To compile this driver as a module, choose M here: the