aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace/Makefile
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-10 11:43:08 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-10 11:43:08 +0200
commitec1bb60bbff0386c3ec25360e7a8c72f467a6ff1 (patch)
tree893c04336763acd84d575fd713773b882e8bc8a6 /kernel/trace/Makefile
parent5373fdbdc1dba69aa956098650f71b731d471885 (diff)
parent37f5d732f34fa099676b2c52b8a57bab01a011de (diff)
downloadkernel_samsung_tuna-ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1.zip
kernel_samsung_tuna-ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1.tar.gz
kernel_samsung_tuna-ec1bb60bbff0386c3ec25360e7a8c72f467a6ff1.tar.bz2
Merge branch 'tracing/sysprof' into auto-ftrace-next
Diffstat (limited to 'kernel/trace/Makefile')
-rw-r--r--kernel/trace/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
index c44a7dc..71d17de 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