summaryrefslogtreecommitdiff
path: root/drivers/usb/musb/davinci.c
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2013-08-09 18:31:23 +0400
committerFelipe Balbi <balbi@ti.com>2013-08-09 18:31:23 +0400
commit9e5f9c8aa85da01a7474655dc6af43b5985ad56a (patch)
tree15ceace09b484a2b351bd26587784cc169a702f0 /drivers/usb/musb/davinci.c
parentd07f4a8200cfc7ff2ba23ef87dd6267a4d70fb10 (diff)
parent3fa4d7344be0afebd80382ffeea6b1787cccf971 (diff)
downloadlinux-9e5f9c8aa85da01a7474655dc6af43b5985ad56a.tar.xz
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/davinci.c')
-rw-r--r--drivers/usb/musb/davinci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c
index 12ab66d26d8f..ed0834e2b72e 100644
--- a/drivers/usb/musb/davinci.c
+++ b/drivers/usb/musb/davinci.c
@@ -33,7 +33,7 @@
#include <linux/gpio.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 <mach/cputype.h>
#include <mach/hardware.h>