summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2013-02-12 09:15:02 -0800
committerVinod Koul <vinod.koul@intel.com>2013-02-13 08:09:37 -0800
commit5fa422c922c2599dbfd960faf6dfca2411cc3f99 (patch)
tree52ae231ffae2032fcf26b39a7c1b4e121bc37710 /drivers
parent4dec23d7718e6f1f5e1773698d112025169e7d49 (diff)
dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c
as requested by Rob Suggested-by: Rob Herring <rob.herring@calxeda.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dma/Kconfig4
-rw-r--r--drivers/dma/Makefile2
-rw-r--r--drivers/dma/of-dma.c (renamed from drivers/of/dma.c)0
-rw-r--r--drivers/of/Makefile2
4 files changed, 7 insertions, 1 deletions
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index 0b408bbb6a17..e92b5f0f8a5f 100644
--- a/drivers/dma/Kconfig
+++ b/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/drivers/dma/Makefile b/drivers/dma/Makefile
index 7428feaa8705..c1ed644be9e2 100644
--- a/drivers/dma/Makefile
+++ b/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/drivers/of/dma.c b/drivers/dma/of-dma.c
index 59631b2c4666..59631b2c4666 100644
--- a/drivers/of/dma.c
+++ b/drivers/dma/of-dma.c
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index eafa107aed40..e027f444d10c 100644
--- a/drivers/of/Makefile
+++ b/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