Merge ../linux-2.6

1 files changed, 19 insertions, 0 deletions

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 5a8a2c91c2b2..5c60be521561 100644
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -71,6 +71,16 @@ config USB_SERIAL_ANYDATA
           To compile this driver as a module, choose M here: the
           module will be called anydata.
 
+config USB_SERIAL_ARK3116
+        tristate "USB ARK Micro 3116 USB Serial Driver (EXPERIMENTAL)"
+        depends on USB_SERIAL && EXPERIMENTAL
+        help
+          Say Y here if you want to use a ARK Micro 3116 USB to Serial
+          device.
+
+          To compile this driver as a module, choose M here: the
+          module will be called ark3116
+
 config USB_SERIAL_BELKIN
         tristate "USB Belkin and Peracom Single Port Serial Driver"
         depends on USB_SERIAL
@@ -158,6 +168,15 @@ config USB_SERIAL_FTDI_SIO
           To compile this driver as a module, choose M here: the
           module will be called ftdi_sio.
 
+config USB_SERIAL_FUNSOFT
+        tristate "USB Fundamental Software Dongle Driver"
+        depends on USB_SERIAL
+        ---help---
+          Say Y here if you want to use the Fundamental Software dongle.
+
+          To compile this driver as a module, choose M here: the
+          module will be called funsoft.
+
 config USB_SERIAL_VISOR
         tristate "USB Handspring Visor / Palm m50x / Sony Clie Driver"
         depends on USB_SERIAL