xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'nop-phy-rename' into next

Browse Source 
Signed-off-by: Felipe Balbi <balbi@ti.com>

Conflicts:
	drivers/usb/phy/phy-generic.c
This commit is contained in:
Felipe Balbi
2013-08-09 17:31:23 +03:00
parent d07f4a8200 3fa4d7344b
commit 9e5f9c8aa8
15 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/usb/nop-usb-xceiv.h → include/linux/usb/usb_phy_gen_xceiv.h
View File

@@ -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);