ftrace: fix merge

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

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index ffbbd54a720e4f904aca58b9d9fff30e4e7cc995..b482fe88bc0437bc43669c70bda520e063ebbecb 100644 (file)
--- 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