Merge branch '7xx-iosplit-plat' with omap-fixes

2009-11-10 18:10:34 -08:00
parent b419148e56 ce491cf854
commit 774facda20
269 changed files with 1702 additions and 1556 deletions
--- a/arch/arm/mach-omap1/board-generic.c
+++ b/arch/arm/mach-omap1/board-generic.c
@@ -23,10 +23,10 @@
 #include <asm/mach/map.h>

 #include <mach/gpio.h>
-#include <mach/mux.h>
-#include <mach/usb.h>
-#include <mach/board.h>
-#include <mach/common.h>
+#include <plat/mux.h>
+#include <plat/usb.h>
+#include <plat/board.h>
+#include <plat/common.h>

 static void __init omap_generic_init_irq(void)
 {