Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / plat-omap / include / mach / omap-alsa.h

diff --git a/include/asm-arm/arch-omap/omap-alsa.h b/arch/arm/plat-omap/include/mach/omap-alsa.h
similarity index 98%
rename from include/asm-arm/arch-omap/omap-alsa.h
rename to arch/arm/plat-omap/include/mach/omap-alsa.h
index 58879bcec0cd153ce34611f8bdc955d856e9819f..b0341e7a0cfa412affe303f4929a10b389eaf75b 100644 (file)
--- a/include/asm-arm/arch-omap/omap-alsa.h
+++ b/arch/arm/plat-omap/include/mach/omap-alsa.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-omap/omap-alsa.h
+ * arch/arm/plat-omap/include/mach/omap-alsa.h
  *
  * Alsa Driver for AIC23 and TSC2101 codecs on OMAP platform boards.
  *
@@ -40,10 +40,10 @@
 #ifndef __OMAP_ALSA_H
 #define __OMAP_ALSA_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>
 #include <linux/platform_device.h>
 /*
  * Debug functions