---

yaml --- r: 358553 b: refs/heads/master c: 5fa422c h: refs/heads/master i: 358551: 2d7bd23 v: v3
git-mirror · Feb 13, 2013 · 8aaf2d5 · 8aaf2d5
1 parent 3332758
commit 8aaf2d5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4dec23d7718e6f1f5e1773698d112025169e7d49
+refs/heads/master: 5fa422c922c2599dbfd960faf6dfca2411cc3f99
diff --git a/trunk/drivers/dma/Kconfig b/trunk/drivers/dma/Kconfig
@@ -325,6 +325,10 @@ config DMA_ENGINE
 config DMA_VIRTUAL_CHANNELS
 	tristate
 
+config DMA_OF
+	def_bool y
+	depends on OF
+
 comment "DMA Clients"
 	depends on DMA_ENGINE
 

diff --git a/trunk/drivers/dma/Makefile b/trunk/drivers/dma/Makefile
@@ -3,6 +3,8 @@ ccflags-$(CONFIG_DMADEVICES_VDEBUG) += -DVERBOSE_DEBUG
 
 obj-$(CONFIG_DMA_ENGINE) += dmaengine.o
 obj-$(CONFIG_DMA_VIRTUAL_CHANNELS) += virt-dma.o
+obj-$(CONFIG_DMA_OF) += of-dma.o
+
 obj-$(CONFIG_NET_DMA) += iovlock.o
 obj-$(CONFIG_INTEL_MID_DMAC) += intel_mid_dma.o
 obj-$(CONFIG_DMATEST) += dmatest.o

diff --git a/trunk/drivers/of/dma.c → trunk/drivers/dma/of-dma.c b/trunk/drivers/of/dma.c → trunk/drivers/dma/of-dma.c
diff --git a/trunk/drivers/of/Makefile b/trunk/drivers/of/Makefile
@@ -1,4 +1,4 @@
-obj-y = base.o dma.o
+obj-y = base.o
 obj-$(CONFIG_OF_FLATTREE) += fdt.o
 obj-$(CONFIG_OF_PROMTREE) += pdt.o
 obj-$(CONFIG_OF_ADDRESS)  += address.o