ARM: arm-soc: Merge branch 'next/clk' into next/pm

Merge together a couple of the smaller pm/clock branches into one. Signed-off-by: Olof Johansson <olof@lixom.net>
2012-12-12 16:09:22 -08:00
parent 5c1af2a701 fb6842a7bc
commit 4a76411ea3
359 changed files with 20233 additions and 20720 deletions
--- a/arch/arm/mach-omap2/omap_phy_internal.c
+++ b/arch/arm/mach-omap2/omap_phy_internal.c
@@ -27,11 +27,11 @@
 #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