diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-11-18 11:13:56 -0500 |
|---|---|---|
| committer | Bjorn Andersson <bjorn.andersson@linaro.org> | 2016-11-18 11:13:56 -0500 |
| commit | 1a494c20d14c725747eb8f039196447e2c366ab6 (patch) | |
| tree | 48ea94fc09785448f1b9f0e8861ae94c8d5d09e2 | |
| parent | f33a73586f4d9f23e2cbb4d978b97dc54dcdfb95 (diff) | |
| parent | 3d6b3715fb5d4b7321a9ebd664991be2ed8f5f7b (diff) | |
Merge branch 'topic/st_fdma' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/slave-dma into rproc-next
* 'topic/st_fdma' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/slave-dma:
dmaengine: st_fdma: Revert: "Revert: Update st_fdma to 'depends on REMOTEPROC'"
| -rw-r--r-- | drivers/dma/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 661f21791fee..6b9671066aef 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig | |||
| @@ -438,6 +438,7 @@ config STE_DMA40 | |||
| 438 | config ST_FDMA | 438 | config ST_FDMA |
| 439 | tristate "ST FDMA dmaengine support" | 439 | tristate "ST FDMA dmaengine support" |
| 440 | depends on ARCH_STI | 440 | depends on ARCH_STI |
| 441 | depends on REMOTEPROC | ||
| 441 | select ST_SLIM_REMOTEPROC | 442 | select ST_SLIM_REMOTEPROC |
| 442 | select DMA_ENGINE | 443 | select DMA_ENGINE |
| 443 | select DMA_VIRTUAL_CHANNELS | 444 | select DMA_VIRTUAL_CHANNELS |