aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mfd/davinci_voicecodec.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 /include/linux/mfd/davinci_voicecodec.h
parentARM: davinci: remove __init atrribute from function declaration (diff)
downloadlinux-dev-3ad7a42d5a9c3736cd6d2c6f7e6038d0ca8b316c.tar.xz
linux-dev-3ad7a42d5a9c3736cd6d2c6f7e6038d0ca8b316c.zip
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 'include/linux/mfd/davinci_voicecodec.h')
-rw-r--r--include/linux/mfd/davinci_voicecodec.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/mfd/davinci_voicecodec.h b/include/linux/mfd/davinci_voicecodec.h
index 0ab61320ffa8..7dd6524d2aac 100644
--- a/include/linux/mfd/davinci_voicecodec.h
+++ b/include/linux/mfd/davinci_voicecodec.h
@@ -26,8 +26,7 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/mfd/core.h>
-
-#include <mach/edma.h>
+#include <linux/platform_data/edma.h>
/*
* Register values.