diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-02 12:54:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-02 12:54:06 -0400 |
| commit | ac0bc7899afc5b69abff64472e2ac4869fd97ff6 (patch) | |
| tree | b8e8ff87a145a38ec00442b6635ac1d3b24e624a /drivers/dma | |
| parent | a8787645e14ce7bbc3db9788526ed0be968c0df2 (diff) | |
| parent | 764480413b7206d295eb6ff58efb057d56aff08b (diff) | |
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dma fix from Vinod Koul:
"A fix for resolving TI_EDMA driver's build error in allmodconfig to
have filter function built in""
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dma/Kconfig: TI_EDMA needs to be boolean
Diffstat (limited to 'drivers/dma')
| -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 6825957c97fb..643d7c7a0d8e 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig | |||
| @@ -194,7 +194,7 @@ config SIRF_DMA | |||
| 194 | Enable support for the CSR SiRFprimaII DMA engine. | 194 | Enable support for the CSR SiRFprimaII DMA engine. |
| 195 | 195 | ||
| 196 | config TI_EDMA | 196 | config TI_EDMA |
| 197 | tristate "TI EDMA support" | 197 | bool "TI EDMA support" |
| 198 | depends on ARCH_DAVINCI || ARCH_OMAP | 198 | depends on ARCH_DAVINCI || ARCH_OMAP |
| 199 | select DMA_ENGINE | 199 | select DMA_ENGINE |
| 200 | select DMA_VIRTUAL_CHANNELS | 200 | select DMA_VIRTUAL_CHANNELS |