Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / sound / oss / omap-audio.h

diff --git a/sound/oss/omap-audio.h b/sound/oss/omap-audio.h
index c039dee3b148c184dc0e14b539197012925792c4..895d8031d7c61c5dbdbafd8ad0144b9ce6b3c065 100644 (file)
--- a/sound/oss/omap-audio.h
+++ b/sound/oss/omap-audio.h
@@ -28,7 +28,7 @@
 #define __OMAP_AUDIO_H
 
 /* Requires dma.h */
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 
 /*
  * Buffer Management