projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'master' and 'devel' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
dma
/
Kconfig
diff --git
a/drivers/dma/Kconfig
b/drivers/dma/Kconfig
index fed57634b6c12467960b9791eb9ac96eb4e1797d..9520cf02edc840f51c6aef659a9dbd5ef6a42806 100644
(file)
--- a/
drivers/dma/Kconfig
+++ b/
drivers/dma/Kconfig
@@
-141,7
+141,7
@@
config TXX9_DMAC
config SH_DMAE
tristate "Renesas SuperH DMAC support"
- depends on
SUPERH && SH_DMA
+ depends on
(SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE)
depends on !SH_DMA_API
select DMA_ENGINE
help