diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:38:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:38:55 -0700 |
| commit | 07fe944e87d79f8d7e1b090913fe9f2ace78f41d (patch) | |
| tree | b20a3576d61d4dc3d89cf47515a786b31fd997d6 /include/asm-arm/arch-iop13xx/adma.h | |
| parent | 8019aa946af5218bc4446c21e43cc19c9401ac68 (diff) | |
| parent | 636bdeaa1243327501edfd2a597ed7443eb4239a (diff) | |
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:
dmaengine: ack to flags: make use of the unused bits in the 'ack' field
iop-adma: remove the workaround for missed interrupts on iop3xx
async_tx: kill ->device_dependency_added
async_tx: fix multiple dependency submission
fsldma: Split the MPC83xx event from MPC85xx and refine irq codes.
fsldma: Remove CONFIG_FSL_DMA_SELFTEST, keep fsl_dma_self_test() running always.
Diffstat (limited to 'include/asm-arm/arch-iop13xx/adma.h')
| -rw-r--r-- | include/asm-arm/arch-iop13xx/adma.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-arm/arch-iop13xx/adma.h b/include/asm-arm/arch-iop13xx/adma.h index efd9a5eb1008..90d14ee564f5 100644 --- a/include/asm-arm/arch-iop13xx/adma.h +++ b/include/asm-arm/arch-iop13xx/adma.h @@ -454,11 +454,6 @@ static inline void iop_chan_append(struct iop_adma_chan *chan) __raw_writel(adma_accr, ADMA_ACCR(chan)); } -static inline void iop_chan_idle(int busy, struct iop_adma_chan *chan) -{ - do { } while (0); -} - static inline u32 iop_chan_get_status(struct iop_adma_chan *chan) { return __raw_readl(ADMA_ACSR(chan)); |