From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Jul 2009 23:46:31 +0000 (-0700)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
X-Git-Tag: MMI-PSA29.97-13-9~27253
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=db06816cb9ceb21a2bf24122407b7b4fe419c3fc;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'next' of git://git./linux/kernel/git/djbw/async_tx

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx:
  dmaengine: at_hdmac: add DMA slave transfers
  dmaengine: at_hdmac: new driver for the Atmel AHB DMA Controller
  dmaengine: dmatest: correct thread_count while using multiple thread per channel
  dmaengine: dmatest: add a maximum number of test iterations
  drivers/dma: Remove unnecessary semicolons
  drivers/dma/fsldma.c: Remove unnecessary semicolons
  dmaengine: move HIGHMEM64G restriction to ASYNC_TX_DMA
  fsldma: do not clear bandwidth control bits on the 83xx controller
  fsldma: enable external start for the 83xx controller
  fsldma: use PCI Read Multiple command
---

db06816cb9ceb21a2bf24122407b7b4fe419c3fc
diff --cc drivers/dma/Makefile
index a0b6564800c4,d7bc5fd17d84..40e1e0083571
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@@ -7,5 -7,5 +7,6 @@@ obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adm
  obj-$(CONFIG_FSL_DMA) += fsldma.o
  obj-$(CONFIG_MV_XOR) += mv_xor.o
  obj-$(CONFIG_DW_DMAC) += dw_dmac.o
+ obj-$(CONFIG_AT_HDMAC) += at_hdmac.o
  obj-$(CONFIG_MX3_IPU) += ipu/
 +obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o