Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / sound / arm / omap / omap-alsa-dma.c

diff --git a/sound/arm/omap/omap-alsa-dma.c b/sound/arm/omap/omap-alsa-dma.c
index baafacf4b70cd2441c42987a27b26b7723255d1a..b2623cbb53f62249d02fc6cd7d8e3ecfc0236747 100644 (file)
--- a/sound/arm/omap/omap-alsa-dma.c
+++ b/sound/arm/omap/omap-alsa-dma.c
@@ -66,10 +66,10 @@
 #include <linux/uaccess.h>
 #include <linux/semaphore.h>
 
-#include <asm/hardware.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/mcbsp.h>
-#include <asm/arch/omap-alsa.h>
+#include <mach/hardware.h>
+#include <mach/dma.h>
+#include <mach/mcbsp.h>
+#include <mach/omap-alsa.h>
 
 #include "omap-alsa-dma.h"