diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-10-30 10:26:11 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-30 10:26:11 +0000 |
| commit | 2231b3729eb92f163bbe64b604410ee451b2c42b (patch) | |
| tree | 4b4043cda9bfcf0912839edbb64484763853bd33 /kernel/trace/trace.h | |
| parent | b99053eefce89c5c8500517f5f065c85b57d98ee (diff) | |
| parent | e946217e4fdaa67681bbabfa8e6b18641921f750 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Diffstat (limited to 'kernel/trace/trace.h')
| -rw-r--r-- | kernel/trace/trace.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index f1f99572cde..6889ca48f1f 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -335,7 +335,7 @@ void update_max_tr_single(struct trace_array *tr, extern cycle_t ftrace_now(int cpu); -#ifdef CONFIG_FTRACE +#ifdef CONFIG_FUNCTION_TRACER void tracing_start_function_trace(void); void tracing_stop_function_trace(void); #else |