diff options
| author | Felipe Balbi <balbi@ti.com> | 2013-08-09 16:31:23 +0200 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2013-08-09 16:31:23 +0200 |
| commit | 9e5f9c8aa85da01a7474655dc6af43b5985ad56a (patch) | |
| tree | 15ceace09b484a2b351bd26587784cc169a702f0 /drivers/usb/musb/am35x.c | |
| parent | usb: phy: mv-usb: remove incorrect __exit_p annotation (diff) | |
| parent | usb: phy: rename nop_usb_xceiv => usb_phy_gen_xceiv (diff) | |
| download | linux-9e5f9c8aa85da01a7474655dc6af43b5985ad56a.tar.xz 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 'drivers/usb/musb/am35x.c')
| -rw-r--r-- | drivers/usb/musb/am35x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/am35x.c b/drivers/usb/musb/am35x.c index baebc39a571b..5c310c664218 100644 --- a/drivers/usb/musb/am35x.c +++ b/drivers/usb/musb/am35x.c @@ -33,7 +33,7 @@ #include <linux/io.h> #include <linux/platform_device.h> #include <linux/dma-mapping.h> -#include <linux/usb/nop-usb-xceiv.h> +#include <linux/usb/usb_phy_gen_xceiv.h> #include <linux/platform_data/usb-omap.h> #include "musb_core.h" |