Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / usb-musb.h

diff --git a/include/asm-arm/arch-omap/usb-musb.h b/arch/arm/plat-omap/include/mach/usb-musb.h
similarity index 96%
rename from include/asm-arm/arch-omap/usb-musb.h
rename to arch/arm/plat-omap/include/mach/usb-musb.h
index 4f0c8309668cf14debdc9e11de897d90ed7296cd..b455b29a3adc394b79511c49a565a46973a4737b 100644 (file)
--- a/include/asm-arm/arch-omap/usb-musb.h
+++ b/arch/arm/plat-omap/include/mach/usb-musb.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/usb-musb.h
+ * arch/arm/plat-omap/include/mach/usb-musb.h
  *
  * Hardware definitions for Mentor Graphics MUSBMHDRC.
  *