diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 05:43:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 05:43:08 -0400 |
| commit | ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1 (patch) | |
| tree | 893c04336763acd84d575fd713773b882e8bc8a6 /kernel/trace/Makefile | |
| parent | 5373fdbdc1dba69aa956098650f71b731d471885 (diff) | |
| parent | 37f5d732f34fa099676b2c52b8a57bab01a011de (diff) | |
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 | |||
| 14 | 14 | ||
| 15 | obj-$(CONFIG_TRACING) += trace.o | 15 | obj-$(CONFIG_TRACING) += trace.o |
| 16 | obj-$(CONFIG_CONTEXT_SWITCH_TRACER) += trace_sched_switch.o | 16 | obj-$(CONFIG_CONTEXT_SWITCH_TRACER) += trace_sched_switch.o |
| 17 | obj-$(CONFIG_SYSPROF_TRACER) += trace_sysprof.o | ||
| 17 | obj-$(CONFIG_FTRACE) += trace_functions.o | 18 | obj-$(CONFIG_FTRACE) += trace_functions.o |
| 18 | obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o | 19 | obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o |
| 19 | obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o | 20 | obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o |