diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2018-01-31 13:50:52 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2018-01-31 13:50:52 +0530 |
| commit | 581f5b1431b5c17ee8cb3fc44b83c7e0f0681934 (patch) | |
| tree | 9358e529670df50a5230b538fe9b0625a082f91f /drivers/dma | |
| parent | 5039104f37d77b7814f125e9a72bcb8630d6c2de (diff) | |
| parent | 1ab8da11829f263a14b55ffcc9acde2fce03616e (diff) | |
Merge branch 'topic/sprd' into for-linus
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/sprd-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c index b652071a2096..b106e8a60af6 100644 --- a/drivers/dma/sprd-dma.c +++ b/drivers/dma/sprd-dma.c @@ -710,7 +710,7 @@ static int sprd_dma_config(struct dma_chan *chan, struct sprd_dma_desc *sdesc, return 0; } -struct dma_async_tx_descriptor * +static struct dma_async_tx_descriptor * sprd_dma_prep_dma_memcpy(struct dma_chan *chan, dma_addr_t dest, dma_addr_t src, size_t len, unsigned long flags) { |