Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / dsp / dspgateway / dsp_core.c

diff --git a/drivers/dsp/dspgateway/dsp_core.c b/drivers/dsp/dspgateway/dsp_core.c
index 68cc9e643ff3de2ded58a8d925e1c00e5f9ca2f9..f2368fb32d8bc3f60d5999cb861c40818a2ed73b 100644 (file)
--- a/drivers/dsp/dspgateway/dsp_core.c
+++ b/drivers/dsp/dspgateway/dsp_core.c
@@ -29,9 +29,9 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <asm/delay.h>
-#include <asm/arch/mailbox.h>
-#include <asm/arch/dsp.h>
-#include <asm/arch/dsp_common.h>
+#include <mach/mailbox.h>
+#include <mach/dsp.h>
+#include <mach/dsp_common.h>
 #include "dsp_mbcmd.h"
 #include "dsp.h"
 #include "ipbuf.h"