diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2017-05-04 16:03:05 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2017-05-04 16:03:05 +0530 |
| commit | f23514b1017905c2798224fa07e236471b9ed1e7 (patch) | |
| tree | ec9c98397b5a190d9a238988fec402f26bbbd1ca /drivers/dma/Kconfig | |
| parent | fbfb8e1dcea0508f203535a92faea7a3ddf24558 (diff) | |
| parent | eda6f4e868e74adfae8ac6b06a863a090affbb14 (diff) | |
| download | linux-f23514b1017905c2798224fa07e236471b9ed1e7.tar.gz linux-f23514b1017905c2798224fa07e236471b9ed1e7.tar.bz2 linux-f23514b1017905c2798224fa07e236471b9ed1e7.zip | |
Merge branch 'topic/cppi' into for-linus
Diffstat (limited to 'drivers/dma/Kconfig')
| -rw-r--r-- | drivers/dma/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 9be6736cb3d2..24e8597b2c3e 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -514,12 +514,12 @@ config TIMB_DMA Enable support for the Timberdale FPGA DMA engine. config TI_CPPI41 - tristate "AM33xx CPPI41 DMA support" - depends on ARCH_OMAP + tristate "CPPI 4.1 DMA support" + depends on (ARCH_OMAP || ARCH_DAVINCI_DA8XX) select DMA_ENGINE help The Communications Port Programming Interface (CPPI) 4.1 DMA engine - is currently used by the USB driver on AM335x platforms. + is currently used by the USB driver on AM335x and DA8xx platforms. config TI_DMA_CROSSBAR bool |