diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-09-14 10:06:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-09-14 10:06:51 +0200 |
| commit | 26f45274afd938d82463816a12ec67448513294a (patch) | |
| tree | 97c232667794b039a9ef3a2ab4444311fb44cbfd /kernel/Makefile | |
| parent | Merge branch 'core/rcu' into perf/core (diff) | |
| parent | kprobes/x86: Fix to support jprobes on ftrace-based kprobe (diff) | |
| download | linux-26f45274afd938d82463816a12ec67448513294a.tar.xz linux-26f45274afd938d82463816a12ec67448513294a.zip | |
Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull tracing updates from Steve Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index c0cc67ad764c..29d993be7dba 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -98,7 +98,7 @@ obj-$(CONFIG_COMPAT_BINFMT_ELF) += elfcore.o obj-$(CONFIG_BINFMT_ELF_FDPIC) += elfcore.o obj-$(CONFIG_FUNCTION_TRACER) += trace/ obj-$(CONFIG_TRACING) += trace/ -obj-$(CONFIG_X86_DS) += trace/ +obj-$(CONFIG_TRACE_CLOCK) += trace/ obj-$(CONFIG_RING_BUFFER) += trace/ obj-$(CONFIG_TRACEPOINTS) += trace/ obj-$(CONFIG_IRQ_WORK) += irq_work.o |