Merge commit 'origin/master' into next

[deliverable/linux.git] / kernel / Makefile

diff --git a/kernel/Makefile b/kernel/Makefile
index e914ca992d70c74b99ee4ac4a6f0c980f2ac7230..90b53f6dc226c674d9b05eee60bcc671bab0edc9 100644 (file)
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -93,6 +93,7 @@ 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/
 obj-$(CONFIG_SMP) += sched_cpupri.o
 obj-$(CONFIG_SLOW_WORK) += slow-work.o
 obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o