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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
dma
/
Kconfig
diff --git
a/drivers/dma/Kconfig
b/drivers/dma/Kconfig
index 1b8877922fb05885efe6c8ed36bca850012cd98d..dab6f17fbbc7d60d03368d1071c1b894bafaf0ee 100644
(file)
--- a/
drivers/dma/Kconfig
+++ b/
drivers/dma/Kconfig
@@
-128,7
+128,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