summaryrefslogtreecommitdiff
path: root/sound/soc/samsung
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-05 12:05:11 (GMT)
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-05 12:05:11 (GMT)
commit75d8f2931a803b803cb4a850448460475c20f30b (patch)
tree9853b9084fa55609c8e4abbc1763bc500e05da50 /sound/soc/samsung
parentffb690d5aa36d38d7bed7579e3f07b84ff6b3a08 (diff)
parente93c7d1bc350189511d32cec2f0af79c30e7fa47 (diff)
downloadlinux-fsl-qoriq-75d8f2931a803b803cb4a850448460475c20f30b.tar.xz
Merge branch 'asoc-omap' into for-3.7
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r--sound/soc/samsung/pcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c
index b7b2a1f..89b0646 100644
--- a/sound/soc/samsung/pcm.c
+++ b/sound/soc/samsung/pcm.c
@@ -20,7 +20,7 @@
#include <sound/pcm_params.h>
#include <plat/audio.h>
-#include <plat/dma.h>
+#include <mach/dma.h>
#include "dma.h"
#include "pcm.h"