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

Commit a431cbaf authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/altera' into for-linus

parents a702e47e 6084fc2e

drivers/dma/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -56,6 +56,12 @@ config DMA_OF 
	select DMA_ENGINE



#devices

config ALTERA_MSGDMA

	tristate "Altera / Intel mSGDMA Engine"

	select DMA_ENGINE

	help

	  Enable support for Altera / Intel mSGDMA controller.



config AMBA_PL08X

	bool "ARM PrimeCell PL080 or PL081 support"

	depends on ARM_AMBA

drivers/dma/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ obj-$(CONFIG_DMA_OF) += of-dma.o 
obj-$(CONFIG_DMATEST) += dmatest.o



#devices

obj-$(CONFIG_ALTERA_MSGDMA) += altera-msgdma.o

obj-$(CONFIG_AMBA_PL08X) += amba-pl08x.o

obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/

obj-$(CONFIG_AT_HDMAC) += at_hdmac.o