Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / board-n800-audio.c

diff --git a/arch/arm/mach-omap2/board-n800-audio.c b/arch/arm/mach-omap2/board-n800-audio.c
index 233198edbd577ca0db8c577442132fe8177d4caf..ebaf21f689f0688c031573a9d4f32e32c4fc4277 100644 (file)
--- a/arch/arm/mach-omap2/board-n800-audio.c
+++ b/arch/arm/mach-omap2/board-n800-audio.c
@@ -27,9 +27,9 @@
 #include <linux/spi/tsc2301.h>
 
 #include <asm/io.h>
-#include <asm/arch/eac.h>
+#include <mach/eac.h>
 
-#include <asm/arch/dsp_common.h>
+#include <mach/dsp_common.h>
 
 #if defined(CONFIG_SPI_TSC2301_AUDIO) && defined(CONFIG_SND_OMAP24XX_EAC)
 #define AUDIO_ENABLED