Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / sound / arm / omap / omap-alsa-aic23.h

diff --git a/sound/arm/omap/omap-alsa-aic23.h b/sound/arm/omap/omap-alsa-aic23.h
index e7dfc155c0aaa4a7feb0394489a90a20ce130280..5431b022699e784640ae6658af1b50f3f2a07535 100644 (file)
--- a/sound/arm/omap/omap-alsa-aic23.h
+++ b/sound/arm/omap/omap-alsa-aic23.h
@@ -18,10 +18,10 @@
 #ifndef __OMAP_ALSA_AIC23_H
 #define __OMAP_ALSA_AIC23_H
 
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
-#include <asm/arch/mcbsp.h>
+#include <mach/mcbsp.h>
 
 /* Define to set the AIC23 as the master w.r.t McBSP */
 #define AIC23_MASTER