Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/dsp/dspgateway/task.c b/drivers/dsp/dspgateway/task.c
index ab189349507d95621151d0ecf19ccfbb5673f535..a371911bffa10cdb0e0388de1d50704208bfc59e 100644 (file)
--- a/drivers/dsp/dspgateway/task.c
+++ b/drivers/dsp/dspgateway/task.c
@@ -36,8 +36,8 @@
 #include <linux/kfifo.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/arch/mailbox.h>
-#include <asm/arch/dsp.h>
+#include <mach/mailbox.h>
+#include <mach/dsp.h>
 #include "uaccess_dsp.h"
 #include "dsp_mbcmd.h"
 #include "dsp.h"