diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-12-11 16:39:35 -0700 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-12-11 16:39:35 -0700 |
| commit | 076843e3e8a4fedb480cdad970f7cec25d32c0ab (patch) | |
| tree | 2d877277c797d24f094811d99c0c2be9802bdf24 /include | |
| parent | 4e3ed8cd37d1f80b77f4f2fe27764b83cfcdcd01 (diff) | |
| parent | 8010dad55a0ab0e829f3733854e5235eef4e2734 (diff) | |
| download | lwn-076843e3e8a4fedb480cdad970f7cec25d32c0ab.tar.gz lwn-076843e3e8a4fedb480cdad970f7cec25d32c0ab.zip | |
Merge branch 'for-3.14/deps-from-dma-of' into for-3.14/dmas-resets-rework
This merges git://git.infradead.org/users/vkoul/slave-dma.git topic/of
Diffstat (limited to 'include')
| -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 ed92b30a02fd..bae1568416f8 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -1087,6 +1087,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) \ |