diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2017-02-21 18:44:35 +0300 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2017-02-21 18:44:35 +0300 |
| commit | 1ad651154b0dfccde5a83fafbe81cff19791f359 (patch) | |
| tree | 15507f740df4bb7de6e76dd8d0942d4a691e4229 /drivers/dma/Kconfig | |
| parent | 8a3ec58382bfb5e9c6b63f47e1bd6335aafc980e (diff) | |
| parent | 067fdeb2f391bfa071f741a2b3eb74b8ff3785cd (diff) | |
| download | linux-1ad651154b0dfccde5a83fafbe81cff19791f359.tar.xz | |
Merge branch 'topic/zx' into for-linus
Diffstat (limited to 'drivers/dma/Kconfig')
| -rw-r--r-- | drivers/dma/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 7dff8467481a..d01d59812cf3 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -571,12 +571,12 @@ config XILINX_ZYNQMP_DMA Enable support for Xilinx ZynqMP DMA controller. config ZX_DMA - tristate "ZTE ZX296702 DMA support" + tristate "ZTE ZX DMA support" depends on ARCH_ZX || COMPILE_TEST select DMA_ENGINE select DMA_VIRTUAL_CHANNELS help - Support the DMA engine for ZTE ZX296702 platform devices. + Support the DMA engine for ZTE ZX family platform devices. # driver files |