diff options
-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 b5b8ba512b28..1b2640ce74f0 100644 --- a/drivers/base/Makefile +++ b/drivers/base/Makefile | |||
@@ -6,6 +6,7 @@ obj-y := core.o sys.o bus.o dd.o \ | |||
6 | attribute_container.o transport_class.o | 6 | attribute_container.o transport_class.o |
7 | obj-y += power/ | 7 | obj-y += power/ |
8 | obj-$(CONFIG_HAS_DMA) += dma-mapping.o | 8 | obj-$(CONFIG_HAS_DMA) += dma-mapping.o |
9 | obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o | ||
9 | obj-$(CONFIG_ISA) += isa.o | 10 | obj-$(CONFIG_ISA) += isa.o |
10 | obj-$(CONFIG_FW_LOADER) += firmware_class.o | 11 | obj-$(CONFIG_FW_LOADER) += firmware_class.o |
11 | obj-$(CONFIG_NUMA) += node.o | 12 | obj-$(CONFIG_NUMA) += node.o |
diff --git a/kernel/dma-coherent.c b/drivers/base/dma-coherent.c index 962a3b574f21..962a3b574f21 100644 --- a/kernel/dma-coherent.c +++ b/drivers/base/dma-coherent.c | |||
diff --git a/kernel/Makefile b/kernel/Makefile index 961379caf666..3d9c7e27e3f9 100644 --- a/kernel/Makefile +++ b/kernel/Makefile | |||
@@ -90,7 +90,6 @@ obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o | |||
90 | obj-$(CONFIG_MARKERS) += marker.o | 90 | obj-$(CONFIG_MARKERS) += marker.o |
91 | obj-$(CONFIG_TRACEPOINTS) += tracepoint.o | 91 | obj-$(CONFIG_TRACEPOINTS) += tracepoint.o |
92 | obj-$(CONFIG_LATENCYTOP) += latencytop.o | 92 | obj-$(CONFIG_LATENCYTOP) += latencytop.o |
93 | obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o | ||
94 | obj-$(CONFIG_FUNCTION_TRACER) += trace/ | 93 | obj-$(CONFIG_FUNCTION_TRACER) += trace/ |
95 | obj-$(CONFIG_TRACING) += trace/ | 94 | obj-$(CONFIG_TRACING) += trace/ |
96 | obj-$(CONFIG_X86_DS) += trace/ | 95 | obj-$(CONFIG_X86_DS) += trace/ |