diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-07-17 12:00:25 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-07-17 12:00:25 +0200 |
commit | 31a05a4127c81d5d7f095c609420bf6df892a8b0 (patch) | |
tree | ebc68a2329703b9e0ba8d1e6ba22c9730c74223c /kernel/trace/Makefile | |
parent | 8217563359878d11ef03cc76bc935ada89d73efd (diff) | |
parent | eb878b3bc0349344dbf70c51bf01fc734d5cf2d3 (diff) |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'kernel/trace/Makefile')
-rw-r--r-- | kernel/trace/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile index 469a1c7555a..84b2c9908da 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile @@ -53,7 +53,6 @@ obj-$(CONFIG_EVENT_TRACING) += trace_event_perf.o endif obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o -obj-$(CONFIG_KSYM_TRACER) += trace_ksym.o obj-$(CONFIG_EVENT_TRACING) += power-traces.o libftrace-y := ftrace.o |