tree 5541ffccba0c1053d94ed58e035f47a9c7d8aefe
parent 1338631433d8de7cf85b7e8fcf1a389ad89e7a8f
author Russell King <rmk+kernel@arm.linux.org.uk> 1333104255 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1333104380 +0100

ARM: sa11x0: fix build errors from DMA engine API updates

The recent merge of the sa11x0 code into mainline had silent conflicts
with further development of the DMA engine API, leading to build errors
and warnings:

drivers/net/irda/sa1100_ir.c: In function 'sa1100_irda_dma_start':
drivers/net/irda/sa1100_ir.c:151: error: too few arguments to function 'chan->device->device_prep_slave_sg'
drivers/dma/sa11x0-dma.c: In function 'sa11x0_dma_probe':
drivers/dma/sa11x0-dma.c:950: warning: assignment from incompatible pointer type

Fix these.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>