diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-04 08:25:23 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-04 08:25:23 -0700 |
commit | 20a2a811602b16c42ce88bada3d52712cdfb988b (patch) | |
tree | f2a30a383c47336b0352ed473abafc0cdca4ca2c /drivers/dma | |
parent | a92bc5a65ce966ccc49bc8e37c6714c0b4042818 (diff) | |
parent | 6d008893e45ad5957a9a31afa00c4c6582504fe5 (diff) | |
download | linux-20a2a811602b16c42ce88bada3d52712cdfb988b.tar.bz2 |
Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
Pull ARM fixes from Russell King:
"Nothing too big here, just small fixes."
* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
ARM: fix more fallout from 9f97da78bf (Disintegrate asm/system.h for ARM)
ARM: fix bios32.c build warning
ARM: 7337/1: ptrace: fix ptrace_read_user for !CONFIG_MMU platforms
ARM: fix missing bug.h include in arch/arm/kernel/insn.c
ARM: sa11x0: fix build errors from DMA engine API updates
Diffstat (limited to 'drivers/dma')
-rw-r--r-- | drivers/dma/sa11x0-dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/sa11x0-dma.c b/drivers/dma/sa11x0-dma.c index 16a6b48883cf..ec78ccef9132 100644 --- a/drivers/dma/sa11x0-dma.c +++ b/drivers/dma/sa11x0-dma.c @@ -585,7 +585,7 @@ static dma_cookie_t sa11x0_dma_tx_submit(struct dma_async_tx_descriptor *tx) static struct dma_async_tx_descriptor *sa11x0_dma_prep_slave_sg( struct dma_chan *chan, struct scatterlist *sg, unsigned int sglen, - enum dma_transfer_direction dir, unsigned long flags) + enum dma_transfer_direction dir, unsigned long flags, void *context) { struct sa11x0_dma_chan *c = to_sa11x0_dma_chan(chan); struct sa11x0_dma_desc *txd; |