diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-02 18:54:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-02 18:54:06 +0200 |
| commit | ac0bc7899afc5b69abff64472e2ac4869fd97ff6 (patch) | |
| tree | b8e8ff87a145a38ec00442b6635ac1d3b24e624a | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | dma/Kconfig: TI_EDMA needs to be boolean (diff) | |
| download | linux-ac0bc7899afc5b69abff64472e2ac4869fd97ff6.tar.xz linux-ac0bc7899afc5b69abff64472e2ac4869fd97ff6.zip | |
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
| -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 Enable support for the CSR SiRFprimaII DMA engine. config TI_EDMA - tristate "TI EDMA support" + bool "TI EDMA support" depends on ARCH_DAVINCI || ARCH_OMAP select DMA_ENGINE select DMA_VIRTUAL_CHANNELS |