From: Vinod Koul Date: Tue, 12 Feb 2013 17:15:02 +0000 (-0800) Subject: dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c X-Git-Tag: v3.9-rc1~80^2~15 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fa422c;p=thirdparty%2Fkernel%2Flinux.git dmaengine: move drivers/of/dma.c -> drivers/dma/of-dma.c as requested by Rob Suggested-by: Rob Herring Signed-off-by: Vinod Koul --- diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 0b408bbb6a17c..e92b5f0f8a5f6 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 7428feaa87053..c1ed644be9e2d 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 similarity index 100% rename from drivers/of/dma.c rename to drivers/dma/of-dma.c diff --git a/drivers/of/Makefile b/drivers/of/Makefile index eafa107aed403..e027f444d10cf 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