diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 04:18:43 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 04:18:43 -0500 |
commit | 99793e3dbe39a50d871eedc361659a894601e2bf (patch) | |
tree | a676d42a42f4c884e38121e5a5a4d6630929a9f7 /kernel/trace/Makefile | |
parent | 3e80680208ba6ce9635ca7c21ad0019442ea166a (diff) | |
parent | a103e2ab7377dbbef2506be59c49a3f2ae10b60b (diff) |
Merge branches 'tracing/kmemtrace2' and 'tracing/ftrace' into tracing/urgent
Diffstat (limited to 'kernel/trace/Makefile')
-rw-r--r-- | kernel/trace/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index 513dc86b5dfa..05c9182061de 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile | |||
@@ -19,6 +19,8 @@ obj-$(CONFIG_FUNCTION_TRACER) += libftrace.o | |||
19 | obj-$(CONFIG_RING_BUFFER) += ring_buffer.o | 19 | obj-$(CONFIG_RING_BUFFER) += ring_buffer.o |
20 | 20 | ||
21 | obj-$(CONFIG_TRACING) += trace.o | 21 | obj-$(CONFIG_TRACING) += trace.o |
22 | obj-$(CONFIG_TRACING) += trace_output.o | ||
23 | obj-$(CONFIG_TRACING) += trace_stat.o | ||
22 | obj-$(CONFIG_CONTEXT_SWITCH_TRACER) += trace_sched_switch.o | 24 | obj-$(CONFIG_CONTEXT_SWITCH_TRACER) += trace_sched_switch.o |
23 | obj-$(CONFIG_SYSPROF_TRACER) += trace_sysprof.o | 25 | obj-$(CONFIG_SYSPROF_TRACER) += trace_sysprof.o |
24 | obj-$(CONFIG_FUNCTION_TRACER) += trace_functions.o | 26 | obj-$(CONFIG_FUNCTION_TRACER) += trace_functions.o |