diff options
| author |  Ingo Molnar <mingo@elte.hu>
| 2008-07-10 11:43:08 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu>
| 2008-07-10 11:43:08 +0200 |
| commit | ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1 (patch) | |
| tree | 893c04336763acd84d575fd713773b882e8bc8a6 /kernel/trace/Makefile | |
| parent | Merge branch 'tracing/mmiotrace' into auto-ftrace-next (diff) | |
| parent | Merge branch 'linus' into tracing/sysprof (diff) | |
| download | linux-ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1.tar.gz linux-ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1.tar.bz2 linux-ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1.zip | |
Merge branch 'tracing/sysprof' into auto-ftrace-next
Diffstat (limited to 'kernel/trace/Makefile')
| -rw-r--r-- | kernel/trace/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index c44a7dce9086..71d17de17288 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_FTRACE) += libftrace.o obj-$(CONFIG_TRACING) += trace.o obj-$(CONFIG_CONTEXT_SWITCH_TRACER) += trace_sched_switch.o +obj-$(CONFIG_SYSPROF_TRACER) += trace_sysprof.o obj-$(CONFIG_FTRACE) += trace_functions.o obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o |