Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / drivers / dsp / dspgateway / uaccess_dsp.h

diff --git a/drivers/dsp/dspgateway/uaccess_dsp.h b/drivers/dsp/dspgateway/uaccess_dsp.h
index 028814ffbe94edc40d4c99ab83e1ae9bc50c397c..839a51aa07108c4821ddcec08b8ee762694ae609 100644 (file)
--- a/drivers/dsp/dspgateway/uaccess_dsp.h
+++ b/drivers/dsp/dspgateway/uaccess_dsp.h
@@ -25,7 +25,7 @@
 #define _OMAP_DSP_UACCESS_DSP_H
 
 #include <asm/uaccess.h>
-#include <asm/arch/dsp_common.h>
+#include <mach/dsp_common.h>
 #include "dsp.h"
 
 #define HAVE_ASM_COPY_FROM_USER_DSP_2B