Merge remote-tracking branch 'slave-dma/next'

[karo-tx-linux.git] / drivers / dma / mmp_tdma.c

diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index b93d73ca84ff1d8d48b4bdd7d1591bf8031d6b6a..05ce16fdf5b2d26bf1f510d2423da7a654f677d0 100644 (file)
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -19,8 +19,8 @@
 #include <linux/platform_device.h>
 #include <linux/device.h>
 #include <mach/regs-icu.h>
-#include <mach/sram.h>
 #include <linux/of_device.h>
+#include <linux/platform_data/dma-mmp_tdma.h>
 
 #include "dmaengine.h"
 
@@ -358,7 +358,7 @@ struct mmp_tdma_desc *mmp_tdma_alloc_descriptor(struct mmp_tdma_chan *tdmac)
 static struct dma_async_tx_descriptor *mmp_tdma_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,
-               void *context)
+               unsigned long flags, void *context)
 {
        struct mmp_tdma_chan *tdmac = to_mmp_tdma_chan(chan);
        struct mmp_tdma_desc *desc;