[PATCH] USB: add driver for funsoft usb serial device

Cc: David Clare <david@funsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index 5a8a2c9..f96b73f 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -158,6 +158,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

diff --git a/drivers/usb/serial/Makefile b/drivers/usb/serial/Makefile
index f7fe417..93c2124 100644 (file)
--- a/drivers/usb/serial/Makefile
+++ b/drivers/usb/serial/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_USB_SERIAL_EDGEPORT)             += io_edgeport.o
 obj-$(CONFIG_USB_SERIAL_EDGEPORT_TI)           += io_ti.o
 obj-$(CONFIG_USB_SERIAL_EMPEG)                 += empeg.o
 obj-$(CONFIG_USB_SERIAL_FTDI_SIO)              += ftdi_sio.o
+obj-$(CONFIG_USB_SERIAL_FUNSOFT)               += funsoft.o
 obj-$(CONFIG_USB_SERIAL_GARMIN)                        += garmin_gps.o
 obj-$(CONFIG_USB_SERIAL_HP4X)                  += hp4x.o
 obj-$(CONFIG_USB_SERIAL_IPAQ)                  += ipaq.o

diff --cc drivers/usb/serial/funsoft.c
Simple merge