ftrace: fix merge

Signed-off-by: Ingo Molnar <mingo@elte.hu>

ftrace: fix merge
Signed-off-by: Ingo Molnar <mingo@elte.hu>
b1829d27 · Ingo Molnar · 492a7ea5 · b1829d27
Commit b1829d27 authored May 28, 2008 by Ingo Molnar
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/linux/ftrace.h include/linux/ftrace.h +1 -1

No files found.
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
@@ -122,7 +122,7 @@ static inline void tracer_disable(void)
 # define trace_preempt_off(a0, a1)		do { } while (0)
 #endif

-#ifdef CONFIG_CONTEXT_SWITCH_TRACER
+#ifdef CONFIG_TRACING
 extern void
 ftrace_special(unsigned long arg1, unsigned long arg2, unsigned long arg3);
 #else