Merge Linus' latest into master

[linux-2.6-omap-h63xx.git] / drivers / usb / gadget / lh7a40x_udc.h

diff --git a/drivers/usb/gadget/lh7a40x_udc.h b/drivers/usb/gadget/lh7a40x_udc.h
index e3bb78524c8817fbb6144f46971f8067ddc2e6d6..ca861203a301c83a468ef3061832d865bb3449cf 100644 (file)
--- a/drivers/usb/gadget/lh7a40x_udc.h
+++ b/drivers/usb/gadget/lh7a40x_udc.h
@@ -47,10 +47,10 @@
 #include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/unaligned.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 
-#include <linux/usb_ch9.h>
-#include <linux/usb_gadget.h>
+#include <linux/usb/ch9.h>
+#include <linux/usb/gadget.h>
 
 /*
  * Memory map