Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / usb-musb.c

diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index cbd59f8e81c0bec778524b98fb28611d48cd3768..2a3593e7bfbce1051507dfdb05d03ec79c22a676 100644 (file)
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -22,12 +22,12 @@
 #include <linux/platform_device.h>
 #include <linux/clk.h>
 #include <asm/io.h>
-#include <asm/arch/mux.h>
+#include <mach/mux.h>
 #include <linux/usb/musb.h>
 
-#include <asm/arch/hardware.h>
-#include <asm/arch/pm.h>
-#include <asm/arch/usb.h>
+#include <mach/hardware.h>
+#include <mach/pm.h>
+#include <mach/usb.h>
 
 #ifdef CONFIG_USB_MUSB_SOC
 static struct resource musb_resources[] = {