Merge current mainline tree into linux-omap tree

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

diff --git a/sound/arm/omap/omap-alsa-tsc2101.c b/sound/arm/omap/omap-alsa-tsc2101.c
index 8a7e770a3d2ca5449b8dfe64f3b0404b7bfc3ad0..6b0e10633469147d11b247f7627bcbef19038d54 100644 (file)
--- a/sound/arm/omap/omap-alsa-tsc2101.c
+++ b/sound/arm/omap/omap-alsa-tsc2101.c
@@ -30,11 +30,11 @@
 #endif
 
 #include <asm/mach-types.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/mcbsp.h>
+#include <mach/dma.h>
+#include <mach/clock.h>
+#include <mach/mcbsp.h>
 #include <asm/hardware/tsc2101.h>
-#include <asm/arch/omap-alsa.h>
+#include <mach/omap-alsa.h>
 
 #include "omap-alsa-tsc2101.h"