Merge branch 'topic/zxdma' into for-linus

diff --cc drivers/dma/Kconfig
Simple merge

diff --cc drivers/dma/Makefile
index e707ff956164cfafe9de63e62d2b6ef2afede9a2,c4c1ccb0013845bfb1ca6d6d33bf3870559f46d4..d056a8ad6ab170a8cde67c781ca13b7547b9007a
--- 1/drivers/dma/Makefile
--- 2/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