]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge commit 'v2.6.31-rc1' into dmaengine
authorDan Williams <dan.j.williams@intel.com>
Tue, 8 Sep 2009 21:32:24 +0000 (14:32 -0700)
committerDan Williams <dan.j.williams@intel.com>
Tue, 8 Sep 2009 21:32:24 +0000 (14:32 -0700)
1  2 
drivers/dma/Kconfig
drivers/dma/Makefile

Simple merge
index d7bc5fd17d846fe3cceb3c426a64884bc39641be,a0b6564800c4871f967bbe7d5cf401ea59fd6314..40e1e008357192b1aced8b1abab5a86460c78352
@@@ -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