diff options
| author | Vinod Koul <vinod.koul@linux.intel.com> | 2011-09-02 16:43:44 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2011-09-02 16:43:44 +0530 |
| commit | 8516f52fa497b37eb3d5e58d34e61a41ae0a553a (patch) | |
| tree | b73175b134d36bea303d2f181ae89a448c2add81 /include/linux/dmaengine.h | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff) | |
| parent | 7b4b88e067d37cbbafd856121767f7e154294eb2 (diff) | |
Merge branch 'next' into v3.1-rc4
Fixed trivial conflicts in drivers/dma/amba-pl08x.c
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'include/linux/dmaengine.h')
| -rw-r--r-- | include/linux/dmaengine.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 8fbf40e0713c..ace51af4369f 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -24,8 +24,7 @@ #include <linux/device.h> #include <linux/uio.h> #include <linux/dma-direction.h> - -struct scatterlist; +#include <linux/scatterlist.h> /** * typedef dma_cookie_t - an opaque DMA cookie @@ -519,6 +518,16 @@ static inline int dmaengine_slave_config(struct dma_chan *chan, (unsigned long)config); } +static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_single( + struct dma_chan *chan, void *buf, size_t len, + enum dma_data_direction dir, unsigned long flags) +{ + struct scatterlist sg; + sg_init_one(&sg, buf, len); + + return chan->device->device_prep_slave_sg(chan, &sg, 1, dir, flags); +} + static inline int dmaengine_terminate_all(struct dma_chan *chan) { return dmaengine_device_control(chan, DMA_TERMINATE_ALL, 0); |