Merge current mainline tree into linux-omap tree

[pandora-kernel.git] / sound / arm / omap / omap-alsa-tsc2102-mixer.c

diff --git a/sound/arm/omap/omap-alsa-tsc2102-mixer.c b/sound/arm/omap/omap-alsa-tsc2102-mixer.c
index cf1f852..74c1fd6 100644 (file)
--- a/sound/arm/omap/omap-alsa-tsc2102-mixer.c
+++ b/sound/arm/omap/omap-alsa-tsc2102-mixer.c
@@ -30,7 +30,7 @@
 #include <linux/types.h>
 #include <linux/spi/tsc2102.h>
 
-#include <asm/arch/omap-alsa.h>
+#include <mach/omap-alsa.h>
 
 #include <sound/initval.h>
 #include <sound/control.h>