Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[wrt350n-kernel.git] / drivers / dma / Makefile
blobf4a0bf6b1bfde0f9618760ad624f4bbd9e1cc052
1 obj-$(CONFIG_DMA_ENGINE) += dmaengine.o
2 obj-$(CONFIG_NET_DMA) += iovlock.o
3 obj-$(CONFIG_INTEL_IOATDMA) += ioatdma.o
4 ioatdma-objs := ioat.o ioat_dma.o ioat_dca.o
5 obj-$(CONFIG_INTEL_IOP_ADMA) += iop-adma.o
6 <<<<<<< HEAD:drivers/dma/Makefile
7 =======
8 obj-$(CONFIG_FSL_DMA) += fsldma.o
9 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:drivers/dma/Makefile