Merge current mainline tree into linux-omap tree

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

diff --git a/sound/arm/omap/eac.c b/sound/arm/omap/eac.c
index 6ae2677d653f8c35ff096d1b3c34f8007d4ae99e..9fe8d7435c1391c0913202bb47f0872a9e18113e 100644 (file)
--- a/sound/arm/omap/eac.c
+++ b/sound/arm/omap/eac.c
@@ -40,7 +40,7 @@
 #include <linux/clk.h>
 
 #include <asm/io.h>
-#include <asm/arch/eac.h>
+#include <mach/eac.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>