Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/dsp/dspgateway/mblog.c b/drivers/dsp/dspgateway/mblog.c
index 2b1e113794c63ca680426823ab2e9410417bd2f9..7e008afb6c90f1c32990457528538eafabe77699 100644 (file)
--- a/drivers/dsp/dspgateway/mblog.c
+++ b/drivers/dsp/dspgateway/mblog.c
@@ -24,7 +24,7 @@
 #include <linux/platform_device.h>
 #include <linux/init.h>
 #include <linux/jiffies.h>
-#include <asm/arch/mailbox.h>
+#include <mach/mailbox.h>
 #include "dsp_mbcmd.h"
 #include "dsp.h"