diff options
author | Paul Chavent <paul.chavent@free.fr> | 2008-01-12 09:23:17 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-02-01 17:35:03 -0500 |
commit | 7bd4b20c876e5f7aa8e1405657aee9078f896d26 (patch) | |
tree | 63a41a61639b3e22a1acc619201a13b66e778abe | |
parent | cd930c931417295ac6b4d9fea62accc67192ac34 (diff) |
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>
-rw-r--r-- | drivers/usb/serial/Kconfig | 15 | ||||
-rw-r--r-- | drivers/usb/serial/ezusb.c | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig index e2d1d928a1e4..5df5d0fe258a 100644 --- a/drivers/usb/serial/Kconfig +++ b/drivers/usb/serial/Kconfig | |||
@@ -43,6 +43,12 @@ config USB_SERIAL_CONSOLE | |||
43 | 43 | ||
44 | If unsure, say N. | 44 | If unsure, say N. |
45 | 45 | ||
46 | config USB_EZUSB | ||
47 | bool "Functions for loading firmware on EZUSB chips" | ||
48 | depends on USB_SERIAL | ||
49 | help | ||
50 | Say Y here if you need EZUSB device support. | ||
51 | |||
46 | config USB_SERIAL_GENERIC | 52 | config USB_SERIAL_GENERIC |
47 | bool "USB Generic Serial Driver" | 53 | bool "USB Generic Serial Driver" |
48 | depends on USB_SERIAL | 54 | depends on USB_SERIAL |
@@ -105,6 +111,7 @@ config USB_SERIAL_CH341 | |||
105 | config USB_SERIAL_WHITEHEAT | 111 | config USB_SERIAL_WHITEHEAT |
106 | tristate "USB ConnectTech WhiteHEAT Serial Driver" | 112 | tristate "USB ConnectTech WhiteHEAT Serial Driver" |
107 | depends on USB_SERIAL | 113 | depends on USB_SERIAL |
114 | select USB_EZUSB | ||
108 | help | 115 | help |
109 | Say Y here if you want to use a ConnectTech WhiteHEAT 4 port | 116 | Say Y here if you want to use a ConnectTech WhiteHEAT 4 port |
110 | USB to serial converter device. | 117 | USB to serial converter device. |
@@ -296,6 +303,7 @@ config USB_SERIAL_IUU | |||
296 | config USB_SERIAL_KEYSPAN_PDA | 303 | config USB_SERIAL_KEYSPAN_PDA |
297 | tristate "USB Keyspan PDA Single Port Serial Driver" | 304 | tristate "USB Keyspan PDA Single Port Serial Driver" |
298 | depends on USB_SERIAL | 305 | depends on USB_SERIAL |
306 | select USB_EZUSB | ||
299 | help | 307 | help |
300 | Say Y here if you want to use a Keyspan PDA single port USB to | 308 | Say Y here if you want to use a Keyspan PDA single port USB to |
301 | serial converter device. This driver makes use of firmware | 309 | serial converter device. This driver makes use of firmware |
@@ -307,6 +315,7 @@ config USB_SERIAL_KEYSPAN_PDA | |||
307 | config USB_SERIAL_KEYSPAN | 315 | config USB_SERIAL_KEYSPAN |
308 | tristate "USB Keyspan USA-xxx Serial Driver" | 316 | tristate "USB Keyspan USA-xxx Serial Driver" |
309 | depends on USB_SERIAL | 317 | depends on USB_SERIAL |
318 | select USB_EZUSB | ||
310 | ---help--- | 319 | ---help--- |
311 | Say Y here if you want to use Keyspan USB to serial converter | 320 | Say Y here if you want to use Keyspan USB to serial converter |
312 | devices. This driver makes use of Keyspan's official firmware | 321 | devices. This driver makes use of Keyspan's official firmware |
@@ -549,6 +558,7 @@ config USB_SERIAL_CYBERJACK | |||
549 | config USB_SERIAL_XIRCOM | 558 | config USB_SERIAL_XIRCOM |
550 | tristate "USB Xircom / Entregra Single Port Serial Driver" | 559 | tristate "USB Xircom / Entregra Single Port Serial Driver" |
551 | depends on USB_SERIAL | 560 | depends on USB_SERIAL |
561 | select USB_EZUSB | ||
552 | help | 562 | help |
553 | Say Y here if you want to use a Xircom or Entregra single port USB to | 563 | Say Y here if you want to use a Xircom or Entregra single port USB to |
554 | serial converter device. This driver makes use of firmware | 564 | serial converter device. This driver makes use of firmware |
@@ -596,11 +606,6 @@ config USB_SERIAL_DEBUG | |||
596 | To compile this driver as a module, choose M here: the | 606 | To compile this driver as a module, choose M here: the |
597 | module will be called usb-debug. | 607 | module will be called usb-debug. |
598 | 608 | ||
599 | config USB_EZUSB | ||
600 | bool | ||
601 | depends on USB_SERIAL_KEYSPAN_PDA || USB_SERIAL_XIRCOM || USB_SERIAL_KEYSPAN || USB_SERIAL_WHITEHEAT | ||
602 | default y | ||
603 | |||
604 | 609 | ||
605 | endmenu | 610 | endmenu |
606 | 611 | ||
diff --git a/drivers/usb/serial/ezusb.c b/drivers/usb/serial/ezusb.c index 97ee718b1da2..3f698baa0abb 100644 --- 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) | |||
53 | } | 53 | } |
54 | 54 | ||
55 | 55 | ||
56 | EXPORT_SYMBOL(ezusb_writememory); | 56 | EXPORT_SYMBOL_GPL(ezusb_writememory); |
57 | EXPORT_SYMBOL(ezusb_set_reset); | 57 | EXPORT_SYMBOL_GPL(ezusb_set_reset); |
58 | 58 | ||