diff --git a/[refs] b/[refs]
index 5ac4e442a12f..9d625ebc6d16 100644
--- 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
index 0b408bbb6a17..e92b5f0f8a5f 100644
--- 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
index 7428feaa8705..c1ed644be9e2 100644
--- 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 b/trunk/drivers/dma/of-dma.c
similarity index 100%
rename from trunk/drivers/of/dma.c
rename to trunk/drivers/dma/of-dma.c
diff --git a/trunk/drivers/of/Makefile b/trunk/drivers/of/Makefile
index eafa107aed40..e027f444d10c 100644
--- 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