Merge current mainline tree into linux-omap tree

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

diff --git a/include/asm-arm/arch-omap/usb.h b/arch/arm/plat-omap/include/mach/usb.h
similarity index 99%
rename from include/asm-arm/arch-omap/usb.h
rename to arch/arm/plat-omap/include/mach/usb.h
index 7a0967bc1c904fee64241be793c684a6bd756f27..e0781558d831b30f3db66e1033ad18d6d5b84766 100644 (file)
--- a/include/asm-arm/arch-omap/usb.h
+++ b/arch/arm/plat-omap/include/mach/usb.h
@@ -3,7 +3,7 @@
 #ifndef        __ASM_ARCH_OMAP_USB_H
 #define        __ASM_ARCH_OMAP_USB_H
 
-#include <asm/arch/board.h>
+#include <mach/board.h>
 
 /*-------------------------------------------------------------------------*/