Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[pandora-kernel.git] / include / linux / dmaengine.h

diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index f9a2e5e..d3fec58 100644 (file)
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -615,11 +615,13 @@ static inline int dmaengine_slave_config(struct dma_chan *chan,
 }
 
 static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_single(
-       struct dma_chan *chan, void *buf, size_t len,
+       struct dma_chan *chan, dma_addr_t buf, size_t len,
        enum dma_transfer_direction dir, unsigned long flags)
 {
        struct scatterlist sg;
-       sg_init_one(&sg, buf, len);
+       sg_init_table(&sg, 1);
+       sg_dma_address(&sg) = buf;
+       sg_dma_len(&sg) = len;
 
        return chan->device->device_prep_slave_sg(chan, &sg, 1,
                                                  dir, flags, NULL);