aboutsummaryrefslogtreecommitdiff
path: root/drivers/dma/Makefile
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2009-09-08 17:52:57 -0700
committerDan Williams <dan.j.williams@intel.com>2009-09-08 17:52:57 -0700
commite12c4fa377ffda2490476caae17f24daaf9c9bd7 (patch)
treeaa7a19d8f7f931709a8a835a4b0d441f83d759fd /drivers/dma/Makefile
parenta348a7e6fdbcd2d5192a09719a479bb238fde727 (diff)
parent4b652f0db3be891c7b76b109c3b55003b920fc96 (diff)
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/dma/Makefile')
-rw-r--r--drivers/dma/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index 40e1e008357..8f115e93b4a 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -1,8 +1,7 @@
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