diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-08-14 13:55:04 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-08-14 13:55:04 +0530 |
| commit | aab81e47f58ea13f8bf7c1046670dd80566b1040 (patch) | |
| tree | cc603805419d35a0412186136f503374712db72d /include/linux/dmaengine.h | |
| parent | 52a9d179109c50b1a5077cc2a653295fa131f0d0 (diff) | |
| parent | 7bb587f4eef8f71ce589f360ab99bb54ab0fc85d (diff) | |
Merge branch 'topic/of' into for-linus
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 cb286b1acdb6..c271608e862e 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -995,6 +995,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_find_channel(enum dma_transaction_type tx_type); +struct dma_chan *dma_get_slave_channel(struct dma_chan *chan); 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) \ |