---

yaml --- r: 162584 b: refs/heads/master c: a56af87 h: refs/heads/master v: v3
git-mirror · Sep 15, 2009 · 612b406 · 612b406
1 parent 60049bb
commit 612b406
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 162dd4212409fd2d36ff22547ea821bf3e86bcc9
+refs/heads/master: a56af87648054089d89874b52e3fc23ed4f274ad
diff --git a/trunk/drivers/base/Makefile b/trunk/drivers/base/Makefile
@@ -6,6 +6,7 @@ obj-y			:= core.o sys.o bus.o dd.o \
 			   attribute_container.o transport_class.o
 obj-y			+= power/
 obj-$(CONFIG_HAS_DMA)	+= dma-mapping.o
+obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
 obj-$(CONFIG_ISA)	+= isa.o
 obj-$(CONFIG_FW_LOADER)	+= firmware_class.o
 obj-$(CONFIG_NUMA)	+= node.o

diff --git a/trunk/kernel/dma-coherent.c → trunk/drivers/base/dma-coherent.c b/trunk/kernel/dma-coherent.c → trunk/drivers/base/dma-coherent.c
diff --git a/trunk/kernel/Makefile b/trunk/kernel/Makefile
@@ -90,7 +90,6 @@ obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o
 obj-$(CONFIG_MARKERS) += marker.o
 obj-$(CONFIG_TRACEPOINTS) += tracepoint.o
 obj-$(CONFIG_LATENCYTOP) += latencytop.o
-obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o
 obj-$(CONFIG_FUNCTION_TRACER) += trace/
 obj-$(CONFIG_TRACING) += trace/
 obj-$(CONFIG_X86_DS) += trace/