diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 12:54:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 12:54:30 -0700 |
| commit | b91385236c00031c64b42b44db8068ad38a5ea11 (patch) | |
| tree | 6336f60dad2f548f01125c7237fc239aed38b4fd /drivers/dma/fsldma.h | |
| parent | d67ae206ef05198824c2a306c0c0edf2d2088920 (diff) | |
| parent | 77cd62e8082b9743b59ee1946a4c3ee2e3cd2bce (diff) | |
| download | op-kernel-dev-b91385236c00031c64b42b44db8068ad38a5ea11.zip op-kernel-dev-b91385236c00031c64b42b44db8068ad38a5ea11.tar.gz | |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
fsldma: allow Freescale Elo DMA driver to be compiled as a module
fsldma: remove internal self-test from Freescale Elo DMA driver
drivers/dma/dmatest.c: switch a GFP_ATOMIC to GFP_KERNEL
dmatest: properly handle duplicate DMA channels
drivers/dma/ioat_dma.c: drop code after return
async_tx: make async_tx_run_dependencies() easier to read
Diffstat (limited to 'drivers/dma/fsldma.h')
| -rw-r--r-- | drivers/dma/fsldma.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/fsldma.h b/drivers/dma/fsldma.h index 6faf07b..4f21a51 100644 --- a/drivers/dma/fsldma.h +++ b/drivers/dma/fsldma.h @@ -114,6 +114,7 @@ struct fsl_dma_device { struct dma_device common; struct fsl_dma_chan *chan[FSL_DMA_MAX_CHANS_PER_DEVICE]; u32 feature; /* The same as DMA channels */ + int irq; /* Channel IRQ */ }; /* Define macros for fsl_dma_chan->feature property */ |
