Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cf3b64c authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/bcm' into for-linus

parents 69fa54a0 4aa819c7

drivers/dma/bcm2835-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{