---

yaml --- r: 197517 b: refs/heads/master c: de5d445 h: refs/heads/master i: 197515: d549813 v: v3
git-mirror · Mar 26, 2010 · 16c6271 · 16c6271
1 parent 8a58c86
commit 16c6271
Show file tree

Hide file tree

Showing 5 changed files with 917 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84c8447c544bc7579097649273bc3f4e1b5de6af
+refs/heads/master: de5d4453c5b224eefd02b6a141ed411a76d458af
diff --git a/trunk/drivers/dma/Kconfig b/trunk/drivers/dma/Kconfig
@@ -149,6 +149,13 @@ config AMCC_PPC440SPE_ADMA
 	help
 	  Enable support for the AMCC PPC440SPe RAID engines.
 
+config TIMB_DMA
+	tristate "Timberdale FPGA DMA support"
+	depends on MFD_TIMBERDALE || HAS_IOMEM
+	select DMA_ENGINE
+	help
+	  Enable support for the Timberdale FPGA DMA engine.
+
 config ARCH_HAS_ASYNC_TX_FIND_CHANNEL
 	bool
 

diff --git a/trunk/drivers/dma/Makefile b/trunk/drivers/dma/Makefile
@@ -20,3 +20,4 @@ obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
 obj-$(CONFIG_SH_DMAE) += shdma.o
 obj-$(CONFIG_COH901318) += coh901318.o coh901318_lli.o
 obj-$(CONFIG_AMCC_PPC440SPE_ADMA) += ppc4xx/
+obj-$(CONFIG_TIMB_DMA) += timb_dma.o