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

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

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 43d6db696f905cc7361cee823ccb60d2ed99d4d6..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
@@ -517,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