Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux into drm...

[karo-tx-linux.git] / include / linux / dmaengine.h

diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index 09da4e56529780f51f6f9a756001849888517c9d..d3201e438d1640ff51339514a561fc2347427220 100644 (file)
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -653,7 +653,8 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_rio_sg(
 
 static inline struct dma_async_tx_descriptor *dmaengine_prep_dma_cyclic(
                struct dma_chan *chan, dma_addr_t buf_addr, size_t buf_len,
-               size_t period_len, enum dma_transfer_direction dir)
+               size_t period_len, enum dma_transfer_direction dir,
+               unsigned long flags)
 {
        return chan->device->device_prep_dma_cyclic(chan, buf_addr, buf_len,
                                                period_len, dir, flags, NULL);