From: Dan Williams <dan.j.williams@intel.com>
Date: Tue, 8 Sep 2009 21:32:24 +0000 (-0700)
Subject: Merge commit 'v2.6.31-rc1' into dmaengine
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a348a7e6fdbcd2d5192a09719a479bb238fde727;p=linux.git

Merge commit 'v2.6.31-rc1' into dmaengine
---

a348a7e6fdbcd2d5192a09719a479bb238fde727
diff --cc drivers/dma/Makefile
index d7bc5fd17d846,a0b6564800c48..40e1e00835719
--- 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