diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 05:23:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 05:23:39 -0400 |
| commit | 62a394eb77a1ddea73273f53ed8c3ccf6e04f2fb (patch) | |
| tree | ee72d87524b29eb9457b45e02a4587d8fbd9191d /kernel/trace/Makefile | |
| parent | d2e82546ae98eee353fae57e389f487586fe380d (diff) | |
| parent | 1b3fa2ce64363c289b3b14723cca7290bf91cfce (diff) | |
Merge branches 'tracing/ftrace' and 'tracing/syscalls'; commit 'v2.6.29-rc8' into tracing/core
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 c7a2943796eb..c3feea01c3e0 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile | |||
| @@ -43,5 +43,6 @@ obj-$(CONFIG_BLK_DEV_IO_TRACE) += blktrace.o | |||
| 43 | obj-$(CONFIG_EVENT_TRACER) += trace_events.o | 43 | obj-$(CONFIG_EVENT_TRACER) += trace_events.o |
| 44 | obj-$(CONFIG_EVENT_TRACER) += events.o | 44 | obj-$(CONFIG_EVENT_TRACER) += events.o |
| 45 | obj-$(CONFIG_EVENT_TRACER) += trace_export.o | 45 | obj-$(CONFIG_EVENT_TRACER) += trace_export.o |
| 46 | obj-$(CONFIG_FTRACE_SYSCALLS) += trace_syscalls.o | ||
| 46 | 47 | ||
| 47 | libftrace-y := ftrace.o | 48 | libftrace-y := ftrace.o |