commit ac0bc7899afc5b69abff64472e2ac4869fd97ff6
author Linus Torvalds <torvalds@linux-foundation.org> Mon Sep 02 09:54:06 2013 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Sep 02 09:54:06 2013 -0700
tree b8e8ff87a145a38ec00442b6635ac1d3b24e624a
parent a8787645e14ce7bbc3db9788526ed0be968c0df2
parent 764480413b7206d295eb6ff58efb057d56aff08b

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

drivers/dma/Kconfig

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 @@
 	  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