Merge current mainline tree into linux-omap tree

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

diff --git a/sound/arm/omap/omap-alsa-tsc2102.c b/sound/arm/omap/omap-alsa-tsc2102.c
index 911e776ffc80615224de564316325047c2f52228..4c34f7cf312725b6e036a725be3669128c523391 100644 (file)
--- a/sound/arm/omap/omap-alsa-tsc2102.c
+++ b/sound/arm/omap/omap-alsa-tsc2102.c
@@ -20,9 +20,9 @@
 #include <linux/io.h>
 #include <linux/spi/tsc2102.h>
 
-#include <asm/arch/dma.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/omap-alsa.h>
+#include <mach/dma.h>
+#include <mach/clock.h>
+#include <mach/omap-alsa.h>
 
 #include "omap-alsa-tsc2102.h"