Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / sound / oss / omap-audio-dma-intfc.c

diff --git a/sound/oss/omap-audio-dma-intfc.c b/sound/oss/omap-audio-dma-intfc.c
index d568582604b8ef99a4638cd11b3a88db6853381a..c6a61369eab924e82cbe03c0cc62b50ea0b81fee 100644 (file)
--- a/sound/oss/omap-audio-dma-intfc.c
+++ b/sound/oss/omap-audio-dma-intfc.c
@@ -51,13 +51,13 @@
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/semaphore.h>
 
-#include <asm/arch/dma.h>
+#include <mach/dma.h>
 #include "omap-audio-dma-intfc.h"
 
-#include <asm/arch/mcbsp.h>
+#include <mach/mcbsp.h>
 
 #include "omap-audio.h"