Merge current mainline tree into linux-omap tree

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

diff --git a/sound/arm/omap/omap-alsa-sx1.c b/sound/arm/omap/omap-alsa-sx1.c
index efcabff4a226b0d00ed58aa9d222553e8d7359c3..62530430fd9dd9d7f022fcf642d5b6243b03ba93 100644 (file)
--- a/sound/arm/omap/omap-alsa-sx1.c
+++ b/sound/arm/omap/omap-alsa-sx1.c
@@ -19,11 +19,11 @@
 #include <linux/slab.h>
 #include <linux/pm.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/mcbsp.h>
-#include <asm/arch/omap-alsa.h>
+#include <mach/dma.h>
+#include <mach/clock.h>
+#include <mach/gpio.h>
+#include <mach/mcbsp.h>
+#include <mach/omap-alsa.h>
 
 #include "omap-alsa-sx1.h"