diff options
| author | Matt Porter | 2013-03-06 11:15:31 -0500 |
|---|---|---|
| committer | Sekhar Nori | 2013-06-18 10:52:03 +0530 |
| commit | 3ad7a42d5a9c3736cd6d2c6f7e6038d0ca8b316c (patch) | |
| tree | 1b2684a334fadc060b3acc1dc4963b935031d1b9 /drivers | |
| parent | b464e3cb294518c8705425335338957bc291d019 (diff) | |
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 'drivers')
| -rw-r--r-- | drivers/dma/edma.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/davinci_mmc.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/edma.c b/drivers/dma/edma.c index cd7e3280fadd..5f3e532436ee 100644 --- a/drivers/dma/edma.c +++ b/drivers/dma/edma.c @@ -24,7 +24,7 @@ #include <linux/slab.h> #include <linux/spinlock.h> -#include <mach/edma.h> +#include <linux/platform_data/edma.h> #include "dmaengine.h" #include "virt-dma.h" diff --git a/drivers/mmc/host/davinci_mmc.c b/drivers/mmc/host/davinci_mmc.c index 3946a0eb3a03..5dfb70c669dc 100644 --- a/drivers/mmc/host/davinci_mmc.c +++ b/drivers/mmc/host/davinci_mmc.c @@ -37,6 +37,7 @@ #include <linux/of.h> #include <linux/of_device.h> +#include <linux/platform_data/edma.h> #include <linux/platform_data/mmc-davinci.h> /* |