Merge remote-tracking branch 'iwlwifi-fixes/master' into NEXT

[sfrench/cifs-2.6.git] / drivers / dma / ste_dma40.c

diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index c7984459ede76bb1dd50b00f55c639d2d88ff741..5fe59335e247ef81518a55fff496256009eafbcf 100644 (file)
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -2531,8 +2531,7 @@ d40_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
 static struct dma_async_tx_descriptor *
 dma40_prep_dma_cyclic(struct dma_chan *chan, dma_addr_t dma_addr,
                     size_t buf_len, size_t period_len,
-                    enum dma_transfer_direction direction, unsigned long flags,
-                    void *context)
+                    enum dma_transfer_direction direction, unsigned long flags)
 {
        unsigned int periods = buf_len / period_len;
        struct dma_async_tx_descriptor *txd;