Merge current mainline tree into linux-omap tree

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

diff --git a/sound/oss/omap-audio-aic23.c b/sound/oss/omap-audio-aic23.c
index 0ecb2f77c6796649553b08eaf0d948945de79414..c603aaa18d524839335193d9a3094d01506fa939 100644 (file)
--- a/sound/oss/omap-audio-aic23.c
+++ b/sound/oss/omap-audio-aic23.c
@@ -41,14 +41,14 @@
 #include <linux/mutex.h>
 
 #include <asm/uaccess.h>
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
 
-#include <asm/arch/mcbsp.h>
-#include <asm/arch/fpga.h>
-#include <asm/arch/aic23.h>
-#include <asm/arch/clock.h>
+#include <mach/mcbsp.h>
+#include <mach/fpga.h>
+#include <mach/aic23.h>
+#include <mach/clock.h>
 
 #include "omap-audio.h"
 #include "omap-audio-dma-intfc.h"