Merge current mainline tree into linux-omap tree

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

diff --git a/arch/arm/mach-omap2/board-n800-dsp.c b/arch/arm/mach-omap2/board-n800-dsp.c
index d524b620571d89630f3c1d946d8b8604c9f50011..5f3f0d6e954fc56ea46d098b765c05f32b68415e 100644 (file)
--- a/arch/arm/mach-omap2/board-n800-dsp.c
+++ b/arch/arm/mach-omap2/board-n800-dsp.c
@@ -28,9 +28,9 @@
 #include <linux/clk.h>
 
 #include <asm/io.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/board.h>
-#include <asm/arch/dsp_common.h>
+#include <mach/clock.h>
+#include <mach/board.h>
+#include <mach/dsp_common.h>
 
 #if    defined(CONFIG_OMAP_DSP)