Merge current mainline tree into linux-omap tree

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

diff --git a/sound/arm/omap/omap-alsa.c b/sound/arm/omap/omap-alsa.c
index f9293cda59cf8a070927e8176954a7b24ade7dd2..45c46e2dfb1de871f0cf0eed0167cda44a3f39db 100644 (file)
--- a/sound/arm/omap/omap-alsa.c
+++ b/sound/arm/omap/omap-alsa.c
@@ -49,7 +49,7 @@
 #include <sound/core.h>
 #include <sound/pcm.h>
 
-#include <asm/arch/omap-alsa.h>
+#include <mach/omap-alsa.h>
 #include "omap-alsa-dma.h"
 
 MODULE_AUTHOR("Mika Laitio");