Merge branch 'omap-fixes'

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-rx51.c

diff --git a/arch/arm/mach-omap2/board-rx51.c b/arch/arm/mach-omap2/board-rx51.c
index e845aacffe205cc0cc496b21f8dbeb6e093d3509..768f507a569fb822e9d59cc7da6d43581d1eb298 100644 (file)
--- a/arch/arm/mach-omap2/board-rx51.c
+++ b/arch/arm/mach-omap2/board-rx51.c
@@ -14,6 +14,8 @@
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/clk.h>
+#include <linux/io.h>
+#include <linux/delay.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -28,11 +30,8 @@
 #include <mach/keypad.h>
 #include <mach/dma.h>
 #include <mach/gpmc.h>
-#include <mach/usb-musb.h>
-
-#include <asm/io.h>
-#include <asm/delay.h>
-
+#include <mach/usb.h>
+#include <mach/board-rx51.h>
 
 static struct omap_uart_config rx51_uart_config = {
        .enabled_uarts  = ((1 << 0) | (1 << 1) | (1 << 2)),