---

yaml --- r: 321119 b: refs/heads/master c: 7bedaa5 h: refs/heads/master i: 321117: f57d0cc 321115: 008bcbe 321111: 143f831 321103: c98db2b 321087: db7025c v: v3
git-mirror · Jul 31, 2012 · a27e2c5 · a27e2c5
1 parent 94cfbcc
commit a27e2c5
Show file tree

Hide file tree

Showing 5 changed files with 554 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 571fa74034701391b1be2ad193f684acfdeb75d1
+refs/heads/master: 7bedaa5537604f34d1d63c5ec7891e559d2a61ed
diff --git a/trunk/drivers/dma/Kconfig b/trunk/drivers/dma/Kconfig
@@ -261,6 +261,12 @@ config DMA_SA11X0
 	  SA-1110 SoCs.  This DMA engine can only be used with on-chip
 	  devices.
 
+config DMA_OMAP
+	tristate "OMAP DMA support"
+	depends on ARCH_OMAP
+	select DMA_ENGINE
+	select DMA_VIRTUAL_CHANNELS
+
 config DMA_ENGINE
 	bool
 

diff --git a/trunk/drivers/dma/Makefile b/trunk/drivers/dma/Makefile
@@ -29,3 +29,4 @@ 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
+obj-$(CONFIG_DMA_OMAP) += omap-dma.o