diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2014-01-07 21:36:24 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2014-01-07 21:36:24 +0530 |
| commit | 0adcdeed6f87ac7230c9a0364ac785b8e70ad275 (patch) | |
| tree | 77fd04c067b024887d801778227501762bdf2ddd /include/linux/dmaengine.h | |
| parent | 4fce628f685945df4fd6fa1cab6f7eb397dc9267 (diff) | |
| parent | 8010dad55a0ab0e829f3733854e5235eef4e2734 (diff) | |
Merge branch 'topic/of' into for-linus
Conflicts:
drivers/dma/mmp_pdma.c
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'include/linux/dmaengine.h')
| -rw-r--r-- | include/linux/dmaengine.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index de550c61ba43..fa6b4285d8d2 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -1086,6 +1086,7 @@ int dma_async_device_register(struct dma_device *device); void dma_async_device_unregister(struct dma_device *device); void dma_run_dependencies(struct dma_async_tx_descriptor *tx); struct dma_chan *dma_get_slave_channel(struct dma_chan *chan); +struct dma_chan *dma_get_any_slave_channel(struct dma_device *device); struct dma_chan *net_dma_find_channel(void); #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y) #define dma_request_slave_channel_compat(mask, x, y, dev, name) \ |