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

2
drivers/usb/musb/musb_dsps.c
View File

@@ -36,7 +36,7 @@
#include <linux/dma-mapping.h>
#include <linux/pm_runtime.h>
#include <linux/module.h>
#include <linux/usb/nop-usb-xceiv.h>
#include <linux/usb/usb_phy_gen_xceiv.h>
#include <linux/platform_data/usb-omap.h>
#include <linux/sizes.h>