From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 30 Mar 2012 10:44:15 +0000 (+0100)
Subject: ARM: sa11x0: fix build errors from DMA engine API updates
X-Git-Tag: v3.4-rc2~28^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9d54540147336c75f81c36c342b3bfec0d4d60d;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed