diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 15:09:29 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-09 15:09:29 +0200 |
| commit | 054d5c9238f3c577ad51195c3ee7803613f322cc (patch) | |
| tree | ff7d9f5c0e0ddf14230ba28f28ef69a2c0a0debf /drivers/dma/Kconfig | |
| parent | Merge branches 'gemini' and 'misc' into devel (diff) | |
| parent | Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene... (diff) | |
| download | linux-054d5c9238f3c577ad51195c3ee7803613f322cc.tar.xz linux-054d5c9238f3c577ad51195c3ee7803613f322cc.zip | |
Merge branch 'devel-stable' into devel
Diffstat (limited to 'drivers/dma/Kconfig')
| -rw-r--r-- | drivers/dma/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 9e01e96fee94..8344375dc015 100644 --- 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 |