Merge branch 'ioat' into dmaengine

diff --combined drivers/dma/Makefile
index 40e1e00,a1cb285..8f115e9
--- 1/drivers/dma/Makefile
--- 2/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@@ -1,12 -1,9 +1,11 @@@
  obj-$(CONFIG_DMA_ENGINE) += dmaengine.o
  obj-$(CONFIG_NET_DMA) += iovlock.o
  obj-$(CONFIG_DMATEST) += dmatest.o
- obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o
- ioatdma-objs := ioat.o ioat_dma.o ioat_dca.o
+ obj-$(CONFIG_INTEL_IOATDMA) += ioat/
  obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o
  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