Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/dsp/dspgateway/taskwatch.c b/drivers/dsp/dspgateway/taskwatch.c
index 0fab20e8b6d087d78e8835a40bcb5b4735672347..a5fea3df1a16a0047966561e71d67f35378ef30e 100644 (file)
--- a/drivers/dsp/dspgateway/taskwatch.c
+++ b/drivers/dsp/dspgateway/taskwatch.c
@@ -26,7 +26,7 @@
 #include <linux/poll.h>
 #include <linux/sched.h>
 #include <asm/uaccess.h>
-#include <asm/arch/dsp.h>
+#include <mach/dsp.h>
 #include <asm/io.h>
 #include "dsp_mbcmd.h"
 #include "dsp.h"