ARM: arm-soc: Merge branch 'next/clk' into next/pm
[linux-3.10.git] / arch / arm / mach-omap2 / omap_phy_internal.c
index 9b56e5e..e237602 100644 (file)
 #include <linux/io.h>
 #include <linux/err.h>
 #include <linux/usb.h>
-
-#include <plat/usb.h>
+#include <linux/usb/musb.h>
 
 #include "soc.h"
 #include "control.h"
+#include "usb.h"
 
 #define CONTROL_DEV_CONF               0x300
 #define PHY_PD                         0x1