diff options
| author | Ming Lei <tom.leiming@gmail.com> | 2009-07-12 21:44:55 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 09:50:47 -0700 |
| commit | a56af87648054089d89874b52e3fc23ed4f274ad (patch) | |
| tree | 81714be5cc39f830b4acf55ec782b46f36e67ebe | |
| parent | 162dd4212409fd2d36ff22547ea821bf3e86bcc9 (diff) | |
driver-core: move dma-coherent.c from kernel to driver/base
Placing dma-coherent.c in driver/base is better than in kernel,
since it contains code to do per-device coherent dma memory
handling.
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/base/Makefile | 1 | ||||
| -rw-r--r-- | drivers/base/dma-coherent.c (renamed from kernel/dma-coherent.c) | 0 | ||||
| -rw-r--r-- | kernel/Makefile | 1 |
3 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/Makefile b/drivers/base/Makefile index b5b8ba512b2..1b2640ce74f 100644 --- a/drivers/base/Makefile +++ b/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/kernel/dma-coherent.c b/drivers/base/dma-coherent.c index 962a3b574f2..962a3b574f2 100644 --- a/kernel/dma-coherent.c +++ b/drivers/base/dma-coherent.c diff --git a/kernel/Makefile b/kernel/Makefile index 961379caf66..3d9c7e27e3f 100644 --- a/kernel/Makefile +++ b/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/ |