Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / usb / host / ehci-omap.h

diff --git a/drivers/usb/host/ehci-omap.h b/drivers/usb/host/ehci-omap.h
index f75eda702a4db915f97351312d4a9cbee4071f2d..9e4378f6bbb3110bd0d37beda3456b0757ccd5eb 100644 (file)
--- a/drivers/usb/host/ehci-omap.h
+++ b/drivers/usb/host/ehci-omap.h
@@ -23,7 +23,7 @@
 #ifndef __EHCI_OMAP_H
 #define __EHCI_OMAP_H
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include "../../../arch/arm/mach-omap2/cm.h"
 #include "../../../arch/arm/mach-omap2/cm-regbits-34xx.h"