diff options
| author |   Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2010-12-09 22:46:29 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-10 14:18:36 -0800 |
| commit | 352a337832774a6929c16b569abe9cedc3db01cc (patch) | |
| tree | aa5c99abbb79155320ab01cb9fcd2f5a1d0691f7 /include/linux/usb/otg.h | |
| parent | usb: gadget: f_fs: Remove redundant unlikely() (diff) | |
| download | linux-dev-352a337832774a6929c16b569abe9cedc3db01cc.tar.xz linux-dev-352a337832774a6929c16b569abe9cedc3db01cc.zip | |
USB: otg: fix link breakage, when the NOP USB Xceiver is a module
If the NOP USB OTG transceiver driver is built as a module, the otg.h
header declares external functions, but if they are referenced from the
kernel proper, as, e.g., in the OMAP3 case, where the omap3evm board is
calling the usb_nop_xceiv_register() function, linkage breaks. This patch
fixes this problem.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/usb/otg.h')
| -rw-r--r-- | include/linux/usb/otg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb/otg.h b/include/linux/usb/otg.h index 0a5b3711e502..a1a1e7a73ec9 100644 --- a/include/linux/usb/otg.h +++ b/include/linux/usb/otg.h @@ -116,7 +116,7 @@ struct otg_transceiver { /* for board-specific init logic */ extern int otg_set_transceiver(struct otg_transceiver *); -#if defined(CONFIG_NOP_USB_XCEIV) || defined(CONFIG_NOP_USB_XCEIV_MODULE) +#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE)) /* sometimes transceivers are accessed only through e.g. ULPI */ extern void usb_nop_xceiv_register(void); extern void usb_nop_xceiv_unregister(void); |