diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 11:43:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 11:43:06 +0200 |
| commit | 5373fdbdc1dba69aa956098650f71b731d471885 (patch) | |
| tree | 8d9f07539896a696352818820c9c5f6612370882 /kernel/trace/Makefile | |
| parent | bac0c9103b31c3dd83ad9d731dd9834e2ba75e4f (diff) | |
| parent | 4d51c7587bb13dbb2fafcad6c0b5231bd864b55f (diff) | |
| download | kernel_samsung_tuna-5373fdbdc1dba69aa956098650f71b731d471885.zip kernel_samsung_tuna-5373fdbdc1dba69aa956098650f71b731d471885.tar.gz kernel_samsung_tuna-5373fdbdc1dba69aa956098650f71b731d471885.tar.bz2 | |
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 d9efbbf..c44a7dc 100644 --- a/kernel/trace/Makefile +++ b/kernel/trace/Makefile @@ -18,5 +18,6 @@ obj-$(CONFIG_FTRACE) += trace_functions.o obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o obj-$(CONFIG_SCHED_TRACER) += trace_sched_wakeup.o +obj-$(CONFIG_MMIOTRACE) += trace_mmiotrace.o libftrace-y := ftrace.o |