diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-08-19 19:18:28 +0200 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-08-19 19:19:18 +0200 |
| commit | 47aad66c2659b8985512b66f87bb5fe7bdc88dff (patch) | |
| tree | 8e788d9ff4bacd907ba3df176eb67e87ff5c3dde /include | |
| parent | Merge tag 'soc-3.12' of git://git.infradead.org/linux-mvebu into next/cleanup (diff) | |
| parent | usb: phy: rename nop_usb_xceiv => usb_phy_gen_xceiv (diff) | |
| download | linux-47aad66c2659b8985512b66f87bb5fe7bdc88dff.tar.xz linux-47aad66c2659b8985512b66f87bb5fe7bdc88dff.zip | |
Merge tag 'omap-for-v3.12/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
From Tony Lindgren:
USB nop phy rename via Felipe Balbi <balbi@ti.com>:
Here's a pull request of one patch to avoid conflicts during the merge
window.
* tag 'omap-for-v3.12/usb-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
usb: phy: rename nop_usb_xceiv => usb_phy_gen_xceiv
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb/usb_phy_gen_xceiv.h (renamed from include/linux/usb/nop-usb-xceiv.h) | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/usb/nop-usb-xceiv.h b/include/linux/usb/usb_phy_gen_xceiv.h index 148d35171aac..f9a7e7bc925b 100644 --- a/include/linux/usb/nop-usb-xceiv.h +++ b/include/linux/usb/usb_phy_gen_xceiv.h @@ -3,7 +3,7 @@ #include <linux/usb/otg.h> -struct nop_usb_xceiv_platform_data { +struct usb_phy_gen_xceiv_platform_data { enum usb_phy_type type; unsigned long clk_rate; @@ -12,7 +12,7 @@ struct nop_usb_xceiv_platform_data { unsigned int needs_reset:1; }; -#if defined(CONFIG_NOP_USB_XCEIV) || (defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE)) +#if IS_ENABLED(CONFIG_NOP_USB_XCEIV) /* sometimes transceivers are accessed only through e.g. ULPI */ extern void usb_nop_xceiv_register(void); extern void usb_nop_xceiv_unregister(void); |