ftrace: fix merge

Signed-off-by: Ingo Molnar <mingo@elte.hu>
17 years ago · b1829d2705
parent 492a7ea5bc
commit b1829d2705
1 changed files with 1 additions and 1 deletions
--- 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