diff options
author | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 05:46:03 +0200 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 05:46:03 +0200 |
commit | 6619f035a64dd44c7238b7341c138a3975d59111 (patch) | |
tree | fce47632273afaa50960abb2c60a04bf63e44783 /drivers/dma/dma-jz4780.c | |
parent | dmaengine: virt-dma: move function declarations (diff) | |
parent | dmaengine: ti-dma-crossbar: enable COMPILE_TEST (diff) | |
download | linux-6619f035a64dd44c7238b7341c138a3975d59111.tar.xz linux-6619f035a64dd44c7238b7341c138a3975d59111.zip |
Merge branch 'topic/compile_test' into for-linus
Diffstat (limited to 'drivers/dma/dma-jz4780.c')
-rw-r--r-- | drivers/dma/dma-jz4780.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/dma-jz4780.c b/drivers/dma/dma-jz4780.c index 27e93368b62c..7373b7a555ec 100644 --- a/drivers/dma/dma-jz4780.c +++ b/drivers/dma/dma-jz4780.c @@ -400,7 +400,7 @@ static struct dma_async_tx_descriptor *jz4780_dma_prep_dma_cyclic( return vchan_tx_prep(&jzchan->vchan, &desc->vdesc, flags); } -struct dma_async_tx_descriptor *jz4780_dma_prep_dma_memcpy( +static struct dma_async_tx_descriptor *jz4780_dma_prep_dma_memcpy( struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, size_t len, unsigned long flags) { |