-next build failures in k3dma.c

[Mark Brown]

On Tue, Jan 13, 2015 at 08:04:00AM +0000, Build bot for Mark Brown wrote:

> 	arm-allmodconfig
> ../drivers/dma/k3dma.c:823:12: error: conflicting types for 'k3_dma_resume'

For several days now k3dma.c has been failing to build in an ARM
allmodconfig because the definition of k3_dma_resume() introduced in
db08425ebd51f (dmaengine: k3: Split device_control) taking a struct
dma_chan * conflicts with that which has been in the file since it was
originally merged taking a struct device *.

Attachment: signature.asc
Description: Digital signature