diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 05:43:06 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 05:43:06 -0400 |
| commit | 5373fdbdc1dba69aa956098650f71b731d471885 (patch) | |
| tree | 8d9f07539896a696352818820c9c5f6612370882 /kernel/trace/Makefile | |
| parent | bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f (diff) | |
| parent | 4d51c7587bb13dbb2fafcad6c0b5231bd864b55f (diff) | |
Merge branch 'tracing/mmiotrace' 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 d9efbbfa2bd..c44a7dce908 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile | |||
| @@ -18,5 +18,6 @@ obj-$(CONFIG_FTRACE) += trace_functions.o | |||
| 18 | obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o | 18 | obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o |
| 19 | obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o | 19 | obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o |
| 20 | obj-$(CONFIG_SCHED_TRACER) += trace_sched_wakeup.o | 20 | obj-$(CONFIG_SCHED_TRACER) += trace_sched_wakeup.o |
| 21 | obj-$(CONFIG_MMIOTRACE) += trace_mmiotrace.o | ||
| 21 | 22 | ||
| 22 | libftrace-y := ftrace.o | 23 | libftrace-y := ftrace.o |