Merge current mainline tree into linux-omap tree

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

diff --git a/drivers/dsp/dspgateway/omap2_dsp.h b/drivers/dsp/dspgateway/omap2_dsp.h
index 0dc43f0edcb78d0812c5ac79fb167c63e45552fa..4ac51806eeba36926368c24cd4574cb8bdaeac7c 100644 (file)
--- a/drivers/dsp/dspgateway/omap2_dsp.h
+++ b/drivers/dsp/dspgateway/omap2_dsp.h
@@ -31,7 +31,7 @@
 #define OMAP24XX_SARAM_SIZE    0x18000
 #endif
 
-#include <asm/arch/hardware.h>
+#include <mach/hardware.h>
 
 /*
  * DSP IPI registers: mapped to 0xe1000000 -- use readX(), writeX()