Merge branch 'topic/imx' into for-linus

baab8537 · Vinod Koul · 4d442482 · 0f06c027 · baab8537 · baab8537
展开全部隐藏空白更改
内联并排

Showing with 380 addition and 199 deletion

drivers/dma/Kconfig drivers/dma/Kconfig +1 -0

drivers/dma/imx-sdma.c drivers/dma/imx-sdma.c +379 -199

未找到文件。
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -250,6 +250,7 @@ config IMX_SDMA
 	tristate "i.MX SDMA support"
 	depends on ARCH_MXC
 	select DMA_ENGINE
+	select DMA_VIRTUAL_CHANNELS
 	help
 	  Support the i.MX SDMA engine. This engine is integrated into
 	  Freescale i.MX25/31/35/51/53/6 chips.

--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c