Merge current mainline tree into linux-omap tree

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

diff --git a/sound/arm/omap/omap-alsa-aic23.c b/sound/arm/omap/omap-alsa-aic23.c
index 1e43608b68e6952fc76090fa107e61c650207c81..9820e51c2e955240c177d9dc7c2697f347baf285 100644 (file)
--- a/sound/arm/omap/omap-alsa-aic23.c
+++ b/sound/arm/omap/omap-alsa-aic23.c
@@ -22,10 +22,10 @@
 #include <sound/initval.h>
 #include <sound/control.h>
 #include <linux/clk.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/aic23.h>
+#include <mach/clock.h>
+#include <mach/aic23.h>
 
-#include <asm/arch/omap-alsa.h>
+#include <mach/omap-alsa.h>
 #include "omap-alsa-aic23.h"
 
 static struct clk *aic23_mclk;