diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-29 18:41:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-29 18:41:19 -0700 |
| commit | 77f890223338c890fc33972673d2bd3a53061570 (patch) | |
| tree | c2ed6ee220adc2c69816feaf4bcd6273f3dcdd97 /include | |
| parent | 4193d9163582b05e33aca3392e46649e5c3da8d1 (diff) | |
| parent | cc60f8878eab892c03d06b10f389232b9b66bd83 (diff) | |
| download | linux-77f890223338c890fc33972673d2bd3a53061570.tar.gz linux-77f890223338c890fc33972673d2bd3a53061570.tar.bz2 linux-77f890223338c890fc33972673d2bd3a53061570.zip | |
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:
dmaengine: fix interrupt clearing for mv_xor
missing inline keyword for static function in linux/dmaengine.h
dma/shdma: move dereference below the NULL check
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 c61d4ca27bcc..e2106495cc11 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -548,7 +548,7 @@ static inline bool dma_dev_has_pq_continue(struct dma_device *dma) return (dma->max_pq & DMA_HAS_PQ_CONTINUE) == DMA_HAS_PQ_CONTINUE; } -static unsigned short dma_dev_to_maxpq(struct dma_device *dma) +static inline unsigned short dma_dev_to_maxpq(struct dma_device *dma) { return dma->max_pq & ~DMA_HAS_PQ_CONTINUE; } |