Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac0bc789 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents a8787645 76448041

drivers/dma/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -194,7 +194,7 @@ config SIRF_DMA 
	  Enable support for the CSR SiRFprimaII DMA engine.

	  Enable support for the CSR SiRFprimaII DMA engine.





config TI_EDMA

config TI_EDMA

	tristate "TI EDMA support"

	bool "TI EDMA support"

	depends on ARCH_DAVINCI || ARCH_OMAP

	depends on ARCH_DAVINCI || ARCH_OMAP

	select DMA_ENGINE

	select DMA_ENGINE

	select DMA_VIRTUAL_CHANNELS

	select DMA_VIRTUAL_CHANNELS