---

yaml --- r: 296330 b: refs/heads/master c: 6365bea h: refs/heads/master v: v3
git-mirror · Mar 7, 2012 · 2880fbd · 2880fbd
1 parent 7e2c2fb
commit 2880fbd
Show file tree

Hide file tree

Showing 6 changed files with 1,546 additions and 435 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c500a35544d6270b127bce7d4c5a15ef454b9e2
+refs/heads/master: 6365bead25efc84a4cf4aa9b0a7638f8a970cdff
diff --git a/trunk/drivers/dma/Kconfig b/trunk/drivers/dma/Kconfig
@@ -252,6 +252,15 @@ config EP93XX_DMA
 	help
 	  Enable support for the Cirrus Logic EP93xx M2P/M2M DMA controller.
 
+config DMA_SA11X0
+	tristate "SA-11x0 DMA support"
+	depends on ARCH_SA1100
+	select DMA_ENGINE
+	help
+	  Support the DMA engine found on Intel StrongARM SA-1100 and
+	  SA-1110 SoCs.  This DMA engine can only be used with on-chip
+	  devices.
+
 config DMA_ENGINE
 	bool
 

diff --git a/trunk/drivers/dma/Makefile b/trunk/drivers/dma/Makefile
@@ -27,3 +27,4 @@ obj-$(CONFIG_PL330_DMA) += pl330.o
 obj-$(CONFIG_PCH_DMA) += pch_dma.o
 obj-$(CONFIG_AMBA_PL08X) += amba-pl08x.o
 obj-$(CONFIG_EP93XX_DMA) += ep93xx_dma.o
+obj-$(CONFIG_DMA_SA11X0) += sa11x0-dma.o