diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 17:12:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 17:12:54 -0700 |
| commit | c511dc1fb6bee58363eb203d53393784f2589d02 (patch) | |
| tree | 20d91e01aec30c462965fba27cfea0c80744d7ed /drivers/dma/mxs-dma.c | |
| parent | 9161c3b796a2841a9a7be3d9c9dd121269ce90e8 (diff) | |
| parent | 634332502366554849fe37e88d05ec0a13e550c8 (diff) | |
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine update from Vinod Koul:
"This time we have a new dmaengine driver from the tegra folks. Also
we have Guennadi's cleanup of sh drivers which incudes a library for
sh drivers. And the usual odd fixes in bunch of drivers and some nice
cleanup of dw_dmac from Andy."
Fix up conflicts in drivers/mmc/host/sh_mmcif.c
* 'next' of git://git.infradead.org/users/vkoul/slave-dma: (46 commits)
dmaengine: Cleanup logging messages
mmc: sh_mmcif: switch to the new DMA channel allocation and configuration
dma: sh: provide a migration path for slave drivers to stop using .private
dma: sh: use an integer slave ID to improve API compatibility
dmaengine: shdma: prepare to stop using struct dma_chan::private
sh: remove unused DMA device pointer from SIU platform data
ASoC: siu: don't use DMA device for channel filtering
dmaengine: shdma: (cosmetic) simplify a static function
dmaengine: at_hdmac: add a few const qualifiers
dw_dmac: use 'u32' for LLI structure members, not dma_addr_t
dw_dmac: mark dwc_dump_lli inline
dma: mxs-dma: Export missing symbols from mxs-dma.c
dma: shdma: convert to the shdma base library
ASoC: fsi: prepare for conversion to the shdma base library
usb: renesas_usbhs: prepare for conversion to the shdma base library
ASoC: siu: prepare for conversion to the shdma base library
serial: sh-sci: prepare for conversion to the shdma base library
mmc: sh_mobile_sdhi: prepare for conversion to the shdma base library
mmc: sh_mmcif: remove unneeded struct sh_mmcif_dma, prepare to shdma conversion
dma: shdma: prepare for conversion to the shdma base library
...
Diffstat (limited to 'drivers/dma/mxs-dma.c')
| -rw-r--r-- | drivers/dma/mxs-dma.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c index c96ab15319f2..7f41b25805fa 100644 --- a/drivers/dma/mxs-dma.c +++ b/drivers/dma/mxs-dma.c @@ -29,7 +29,6 @@ #include <linux/of_device.h> #include <asm/irq.h> -#include <mach/mxs.h> #include "dmaengine.h" @@ -201,6 +200,7 @@ int mxs_dma_is_apbh(struct dma_chan *chan) return dma_is_apbh(mxs_dma); } +EXPORT_SYMBOL_GPL(mxs_dma_is_apbh); int mxs_dma_is_apbx(struct dma_chan *chan) { @@ -209,6 +209,7 @@ int mxs_dma_is_apbx(struct dma_chan *chan) return !dma_is_apbh(mxs_dma); } +EXPORT_SYMBOL_GPL(mxs_dma_is_apbx); static void mxs_dma_reset_chan(struct mxs_dma_chan *mxs_chan) { |