Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma

ac0bc789 · Linus Torvalds <[email protected]> · 2013-09-02 09:54:06 -07:00

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

Commit: ac0bc7899afc5b69abff64472e2ac4869fd97ff6
Parents: a8787645 · 76448041

Merge commit. Changes below are compared with the first parent: a8787645.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/dma/Kconfig	modified	+1	−1	View file

drivers/dma/Kconfig

View file

diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 6825957..643d7c7 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