USB: usbserial: provide ezusb functions for an external module.

When building an external module, the ezusb_* functions are not defined
if we haven't loaded any built'in module that use them (whiteheat,
keyspan, ...).

This patch allow to build those functions even if we only have selected
the usbserial generic driver.

Signed-off-by: Paul Chavent <paul.chavent@fnac.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
index e2d1d928a1e4e91d1388a41b55b5820264fc0d90..5df5d0fe258a29ad05ebb0a218975fc7d0b9e008 100644 (file)
--- a/drivers/usb/serial/Kconfig
+++ b/drivers/usb/serial/Kconfig
@@ -43,6 +43,12 @@ config USB_SERIAL_CONSOLE
 
          If unsure, say N.
 
+config USB_EZUSB
+       bool "Functions for loading firmware on EZUSB chips"
+       depends on USB_SERIAL
+       help
+           Say Y here if you need EZUSB device support.
+
 config USB_SERIAL_GENERIC
        bool "USB Generic Serial Driver"
        depends on USB_SERIAL
@@ -105,6 +111,7 @@ config USB_SERIAL_CH341
 config USB_SERIAL_WHITEHEAT
        tristate "USB ConnectTech WhiteHEAT Serial Driver"
        depends on USB_SERIAL
+       select USB_EZUSB
        help
          Say Y here if you want to use a ConnectTech WhiteHEAT 4 port
          USB to serial converter device.
@@ -296,6 +303,7 @@ config USB_SERIAL_IUU
 config USB_SERIAL_KEYSPAN_PDA
        tristate "USB Keyspan PDA Single Port Serial Driver"
        depends on USB_SERIAL
+       select USB_EZUSB
        help
          Say Y here if you want to use a Keyspan PDA single port USB to
          serial converter device.  This driver makes use of firmware
@@ -307,6 +315,7 @@ config USB_SERIAL_KEYSPAN_PDA
 config USB_SERIAL_KEYSPAN
        tristate "USB Keyspan USA-xxx Serial Driver"
        depends on USB_SERIAL
+       select USB_EZUSB
        ---help---
          Say Y here if you want to use Keyspan USB to serial converter
          devices.  This driver makes use of Keyspan's official firmware
@@ -549,6 +558,7 @@ config USB_SERIAL_CYBERJACK
 config USB_SERIAL_XIRCOM
        tristate "USB Xircom / Entregra Single Port Serial Driver"
        depends on USB_SERIAL
+       select USB_EZUSB
        help
          Say Y here if you want to use a Xircom or Entregra single port USB to
          serial converter device.  This driver makes use of firmware
@@ -596,11 +606,6 @@ config USB_SERIAL_DEBUG
          To compile this driver as a module, choose M here: the
          module will be called usb-debug.
 
-config USB_EZUSB
-       bool
-       depends on USB_SERIAL_KEYSPAN_PDA || USB_SERIAL_XIRCOM || USB_SERIAL_KEYSPAN || USB_SERIAL_WHITEHEAT
-       default y
-
 
 endmenu
 

diff --git a/drivers/usb/serial/ezusb.c b/drivers/usb/serial/ezusb.c
index 97ee718b1da2a29bf08ed4f30e88cff14bb3beb9..3f698baa0abb69d1015c4d69fa7576d357f0b9c5 100644 (file)
--- a/drivers/usb/serial/ezusb.c
+++ b/drivers/usb/serial/ezusb.c
@@ -53,6 +53,6 @@ int ezusb_set_reset (struct usb_serial *serial, unsigned char reset_bit)
 }
 
 
-EXPORT_SYMBOL(ezusb_writememory);
-EXPORT_SYMBOL(ezusb_set_reset);
+EXPORT_SYMBOL_GPL(ezusb_writememory);
+EXPORT_SYMBOL_GPL(ezusb_set_reset);