Merge branch 'topic/sprd' into for-linus

581f5b14 · Vinod Koul · 5039104f · 1ab8da11 · 581f5b14
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

drivers/dma/sprd-dma.c drivers/dma/sprd-dma.c +1 -1

未找到文件。
--- 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)
 {