summaryrefslogtreecommitdiffstats
path: root/drivers/dma/Makefile
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2015-08-23 18:54:39 +0530
committerVinod Koul <vinod.koul@intel.com>2015-08-23 18:54:39 +0530
commitb2b48ac4c584ae31eb23ad1f86964cc6e52eaa54 (patch)
tree9e973522bc1f407be44afdee3743b227c945007d /drivers/dma/Makefile
parent76891cc8c4930e21b9bce226524f1b57756bc25e (diff)
parented9c87b33147e5b007e66a282b9c8c307fbf8bf9 (diff)
downloadlinux-b2b48ac4c584ae31eb23ad1f86964cc6e52eaa54.tar.bz2
Merge branch 'topic/zxdma' into for-linus
Diffstat (limited to 'drivers/dma/Makefile')
-rw-r--r--drivers/dma/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile
index e707ff956164..d056a8ad6ab1 100644
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@ -58,3 +58,4 @@ obj-$(CONFIG_DMA_SUN6I) += sun6i-dma.o
obj-$(CONFIG_DMA_SUN4I) += sun4i-dma.o
obj-$(CONFIG_IMG_MDC_DMA) += img-mdc-dma.o
obj-$(CONFIG_XGENE_DMA) += xgene-dma.o
+obj-$(CONFIG_ZX_DMA) += zx296702_dma.o