Merge current mainline tree into linux-omap tree

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

diff --git a/sound/arm/omap/omap-alsa-dma.h b/sound/arm/omap/omap-alsa-dma.h
index 2f0e4e8a2f9e7f4e44c80364a9ed343a54960d3e..0dcd379141830b6c0bd0e2d9b99854953c209dac 100644 (file)
--- a/sound/arm/omap/omap-alsa-dma.h
+++ b/sound/arm/omap/omap-alsa-dma.h
@@ -31,7 +31,7 @@
 #ifndef __OMAP_AUDIO_ALSA_DMA_H
 #define __OMAP_AUDIO_ALSA_DMA_H
 
-#include <asm/arch/omap-alsa.h>
+#include <mach/omap-alsa.h>
 
 /* Global data structures */