ftrace: fix merge

Signed-off-by: Ingo Molnar <mingo@elte.hu>
git-mirror · May 27, 2008 · b1829d2 · b1829d2
1 parent 492a7ea
commit b1829d2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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