diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:28:56 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-16 10:28:56 -0800 |
| commit | 7949456b1b96924c2d9ae5aea5fa7d4c81c946ed (patch) | |
| tree | 819e64dcd686c8b53c698c164aea96a002e8b5f8 /drivers/dma/Makefile | |
| parent | 60d9aa758c00f20ade0cb1951f6a934f628dd2d7 (diff) | |
| parent | 12458ea06efd7b44281e68fe59c950ec7d59c649 (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:
ppc440spe-adma: adds updated ppc440spe adma driver
iop-adma.c: use resource_size()
dmaengine: clarify the meaning of the DMA_CTRL_ACK flag
sh: stylistic improvements for the DMA driver
dmaengine: fix dmatest to verify minimum transfer length and test buffer size
sh: DMA driver has to specify its alignment requirements
Add COH 901 318 DMA block driver v5
Diffstat (limited to 'drivers/dma/Makefile')
| -rw-r--r-- | drivers/dma/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index eca71ba78ae..807053d4823 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -10,3 +10,5 @@ obj-$(CONFIG_AT_HDMAC) += at_hdmac.o obj-$(CONFIG_MX3_IPU) += ipu/ obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o obj-$(CONFIG_SH_DMAE) += shdma.o +obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o +obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/ |