diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:52:57 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:52:57 -0400 |
| commit | e12c4fa377ffda2490476caae17f24daaf9c9bd7 (patch) | |
| tree | aa7a19d8f7f931709a8a835a4b0d441f83d759fd /drivers/dma/Makefile | |
| parent | a348a7e6fdbcd2d5192a09719a479bb238fde727 (diff) | |
| parent | 4b652f0db3be891c7b76b109c3b55003b920fc96 (diff) | |
Merge branch 'ioat' into dmaengine
Diffstat (limited to 'drivers/dma/Makefile')
| -rw-r--r-- | drivers/dma/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile index 40e1e0083571..8f115e93b4a1 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile | |||
| @@ -1,8 +1,7 @@ | |||
| 1 | obj-$(CONFIG_DMA_ENGINE) += dmaengine.o | 1 | obj-$(CONFIG_DMA_ENGINE) += dmaengine.o |
| 2 | obj-$(CONFIG_NET_DMA) += iovlock.o | 2 | obj-$(CONFIG_NET_DMA) += iovlock.o |
| 3 | obj-$(CONFIG_DMATEST) += dmatest.o | 3 | obj-$(CONFIG_DMATEST) += dmatest.o |
| 4 | obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o | 4 | obj-$(CONFIG_INTEL_IOATDMA) += ioat/ |
| 5 | ioatdma-objs := ioat.o ioat_dma.o ioat_dca.o | ||
| 6 | obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o | 5 | obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o |
| 7 | obj-$(CONFIG_FSL_DMA) += fsldma.o | 6 | obj-$(CONFIG_FSL_DMA) += fsldma.o |
| 8 | obj-$(CONFIG_MV_XOR) += mv_xor.o | 7 | obj-$(CONFIG_MV_XOR) += mv_xor.o |