diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-08-10 18:17:52 -0400 |
| commit | 0b019a41553a919965bb02d07d54e3e6c57a796d (patch) | |
| tree | 6e329b4159b440d2aac5200a5c07103fe261c096 /drivers/dma/Kconfig | |
| parent | 5f6878b0d22f9b93f9698f88c335007e2a3c3bbc (diff) | |
| parent | 054d5c9238f3c577ad51195c3ee7803613f322cc (diff) | |
Merge branches 'master' and 'devel' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
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 fed57634b6c1..9520cf02edc8 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig | |||
| @@ -141,7 +141,7 @@ config TXX9_DMAC | |||
| 141 | 141 | ||
| 142 | config SH_DMAE | 142 | config SH_DMAE |
| 143 | tristate "Renesas SuperH DMAC support" | 143 | tristate "Renesas SuperH DMAC support" |
| 144 | depends on SUPERH && SH_DMA | 144 | depends on (SUPERH && SH_DMA) || (ARM && ARCH_SHMOBILE) |
| 145 | depends on !SH_DMA_API | 145 | depends on !SH_DMA_API |
| 146 | select DMA_ENGINE | 146 | select DMA_ENGINE |
| 147 | help | 147 | help |