Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/dsp/dspgateway/error.c b/drivers/dsp/dspgateway/error.c
index d2276f939190db7997772a4c7368c29ceb092b1a..66d9c8aa51fc7acf80d8a7e8a403da0e87dd3e86 100644 (file)
--- a/drivers/dsp/dspgateway/error.c
+++ b/drivers/dsp/dspgateway/error.c
@@ -26,7 +26,7 @@
 #include <linux/poll.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
-#include <asm/arch/mailbox.h>
+#include <mach/mailbox.h>
 #include <asm/uaccess.h>
 #include "dsp_mbcmd.h"
 #include "dsp.h"