Merge branches 'cleanup-udc' and 'cleanup-dma' into cleanup

2012-06-28 05:46:41 -07:00
parent 6b16351acb b924b20470 bedfb7adc7
commit 5f6129675b
32 changed files with 338 additions and 838 deletions
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -44,7 +44,8 @@
 #include <asm/mach-types.h>

 #include <plat/dma.h>
-#include <plat/usb.h>
+
+#include <mach/usb.h>

 #include "omap_udc.h"