diff options
| author | Felipe Balbi <balbi@ti.com> | 2013-08-09 17:31:23 +0300 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-08-09 17:31:23 +0300 |
| commit | 9e5f9c8aa85da01a7474655dc6af43b5985ad56a (patch) | |
| tree | 15ceace09b484a2b351bd26587784cc169a702f0 /include/linux/usb | |
| parent | d07f4a8200cfc7ff2ba23ef87dd6267a4d70fb10 (diff) | |
| parent | 3fa4d7344be0afebd80382ffeea6b1787cccf971 (diff) | |
| download | blackbird-op-linux-9e5f9c8aa85da01a7474655dc6af43b5985ad56a.tar.gz blackbird-op-linux-9e5f9c8aa85da01a7474655dc6af43b5985ad56a.zip | |
Merge branch 'nop-phy-rename' into next
Signed-off-by: Felipe Balbi <balbi@ti.com>
Conflicts:
drivers/usb/phy/phy-generic.c
Diffstat (limited to 'include/linux/usb')
| -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); |
