From: Vinod Koul <vinod.koul@intel.com>
Date: Sun, 23 Aug 2015 13:24:39 +0000 (+0530)
Subject: Merge branch 'topic/zxdma' into for-linus
X-Git-Tag: v4.3-rc1~80^2~13
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b2b48ac4c584ae31eb23ad1f86964cc6e52eaa54;p=linux.git

Merge branch 'topic/zxdma' into for-linus
---

b2b48ac4c584ae31eb23ad1f86964cc6e52eaa54
diff --cc drivers/dma/Makefile
index e707ff956164,c4c1ccb00138..d056a8ad6ab1
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
@@@ -55,6 -54,6 +55,7 @@@ obj-y += xilinx
  obj-$(CONFIG_INTEL_MIC_X100_DMA) += mic_x100_dma.o
  obj-$(CONFIG_NBPFAXI_DMA) += nbpfaxi.o
  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