diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 14:26:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-04 14:26:01 -0500 |
| commit | b1c3c3ebf70548bb182d570b79a3f21045cd30e5 (patch) | |
| tree | ad70af0d0fa33b737ff1ae28e59761865b24bdae /include | |
| parent | 87baa2bb904ed46f872385fe430b6cfb80967835 (diff) | |
| parent | 6497dcffe07b7c3d863f9899280c4f6eae999161 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
ioat: fix 'ack' handling, driver must ensure that 'ack' is zero
dmaengine: fix sparse warning
fsldma: do not cleanup descriptors in hardirq context
dmaengine: add driver for Freescale MPC85xx DMA controller
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dmaengine.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index acbb364674ff..261e43a4c873 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
| @@ -366,7 +366,7 @@ __dma_has_cap(enum dma_transaction_type tx_type, dma_cap_mask_t *srcp) | |||
| 366 | */ | 366 | */ |
| 367 | static inline void dma_async_issue_pending(struct dma_chan *chan) | 367 | static inline void dma_async_issue_pending(struct dma_chan *chan) |
| 368 | { | 368 | { |
| 369 | return chan->device->device_issue_pending(chan); | 369 | chan->device->device_issue_pending(chan); |
| 370 | } | 370 | } |
| 371 | 371 | ||
| 372 | #define dma_async_memcpy_issue_pending(chan) dma_async_issue_pending(chan) | 372 | #define dma_async_memcpy_issue_pending(chan) dma_async_issue_pending(chan) |