diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-30 12:44:15 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-03-30 12:46:20 +0200 |
| commit | d9d54540147336c75f81c36c342b3bfec0d4d60d (patch) | |
| tree | 5541ffccba0c1053d94ed58e035f47a9c7d8aefe /arch/arm/kernel/insn.c | |
| parent | Merge branch 'for-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | linux-d9d54540147336c75f81c36c342b3bfec0d4d60d.tar.xz linux-d9d54540147336c75f81c36c342b3bfec0d4d60d.zip | |
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>
Diffstat (limited to 'arch/arm/kernel/insn.c')
0 files changed, 0 insertions, 0 deletions