Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap2/board-n810.c b/arch/arm/mach-omap2/board-n810.c
index 8609a0b6591a254e7f4362dd4735e11ec1e517ff..7984d43aeec9189c723306c82a0fd9e91824a00d 100644 (file)
--- a/arch/arm/mach-omap2/board-n810.c
+++ b/arch/arm/mach-omap2/board-n810.c
@@ -13,11 +13,11 @@
 #include <linux/i2c.h>
 #include <linux/i2c/lm8323.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
-#include <asm/arch/board.h>
-#include <asm/arch/common.h>
+#include <mach/board.h>
+#include <mach/common.h>
 
 #include "board-n800.h"