summaryrefslogtreecommitdiff
path: root/sound/soc/davinci/davinci-pcm.h
diff options
context:
space:
mode:
authorMatt Porter <mporter@ti.com>2013-03-06 11:15:31 -0500
committerSekhar Nori <nsekhar@ti.com>2013-06-18 10:52:03 +0530
commit3ad7a42d5a9c3736cd6d2c6f7e6038d0ca8b316c (patch)
tree1b2684a334fadc060b3acc1dc4963b935031d1b9 /sound/soc/davinci/davinci-pcm.h
parentb464e3cb294518c8705425335338957bc291d019 (diff)
downloadlinux-3ad7a42d5a9c3736cd6d2c6f7e6038d0ca8b316c.tar.gz
ARM: davinci: move private EDMA API to arm/common
Move mach-davinci/dma.c to common/edma.c so it can be used by OMAP (specifically AM33xx) as well. Signed-off-by: Matt Porter <mporter@ti.com> Acked-by: Chris Ball <cjb@laptop.org> # davinci_mmc.c Acked-by: Mark Brown <broonie@linaro.org> Acked-by: Olof Johansson <olof@lixom.net> [nsekhar@ti.com: dropped davinci sffsdr changes] Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'sound/soc/davinci/davinci-pcm.h')
-rw-r--r--sound/soc/davinci/davinci-pcm.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/davinci/davinci-pcm.h b/sound/soc/davinci/davinci-pcm.h
index b6ef7039dd09..fbb710c76c08 100644
--- a/sound/soc/davinci/davinci-pcm.h
+++ b/sound/soc/davinci/davinci-pcm.h
@@ -14,7 +14,7 @@
#include <linux/genalloc.h>
#include <linux/platform_data/davinci_asp.h>
-#include <mach/edma.h>
+#include <linux/platform_data/edma.h>
struct davinci_pcm_dma_params {
int channel; /* sync dma channel ID */