summaryrefslogtreecommitdiffstats
path: root/drivers/net/phy
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2012-03-30 11:44:15 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-03-30 11:46:20 +0100
commitd9d54540147336c75f81c36c342b3bfec0d4d60d (patch)
tree5541ffccba0c1053d94ed58e035f47a9c7d8aefe /drivers/net/phy
parent1338631433d8de7cf85b7e8fcf1a389ad89e7a8f (diff)
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 'drivers/net/phy')
0 files changed, 0 insertions, 0 deletions