diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-07-16 14:39:43 (GMT) |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-07-16 14:39:43 (GMT) |
| commit | 3cf3b64c0fab11861eb52ab09182806fb1e73842 (patch) | |
| tree | 87ebfe761276f8ebb2b552e888d9fe8a268ed798 /drivers/dma | |
| parent | 69fa54a009e33073f9b3a710d21aac30d460d063 (diff) | |
| parent | 4aa819c79bb73f3d1bdf5244d0a0f7f15261504c (diff) | |
| download | linux-3cf3b64c0fab11861eb52ab09182806fb1e73842.tar.xz | |
Merge branch 'topic/bcm' into for-linus
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/bcm2835-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/bcm2835-dma.c b/drivers/dma/bcm2835-dma.c index c8dd5b0..e18dc59 100644 --- a/drivers/dma/bcm2835-dma.c +++ b/drivers/dma/bcm2835-dma.c @@ -614,7 +614,7 @@ static void bcm2835_dma_issue_pending(struct dma_chan *chan) spin_unlock_irqrestore(&c->vc.lock, flags); } -struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_memcpy( +static struct dma_async_tx_descriptor *bcm2835_dma_prep_dma_memcpy( struct dma_chan *chan, dma_addr_t dst, dma_addr_t src, size_t len, unsigned long flags) { |