Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/dsp/dspgateway/dsp_ctl.c b/drivers/dsp/dspgateway/dsp_ctl.c
index 79c1fdf89afaea4ebea537de20a89a834c303cc0..712c3cfad09c087eb4f9a0dc11c3d725ae98eae7 100644 (file)
--- a/drivers/dsp/dspgateway/dsp_ctl.c
+++ b/drivers/dsp/dspgateway/dsp_ctl.c
@@ -33,8 +33,8 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <asm/ioctls.h>
-#include <asm/arch/mailbox.h>
-#include <asm/arch/dsp.h>
+#include <mach/mailbox.h>
+#include <mach/dsp.h>
 #include "hardware_dsp.h"
 #include "dsp_mbcmd.h"
 #include "dsp.h"