diff --git a/[refs] b/[refs]
index 718f57181eec..e8d2cd329bb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 492a7ea5bcf263ee02a9eb6a3ab0222a1946fade
+refs/heads/master: b1829d2705daa7cb72eb1e08bdc8b7e9fad34266
diff --git a/trunk/include/linux/ftrace.h b/trunk/include/linux/ftrace.h
index ffbbd54a720e..b482fe88bc04 100644
--- a/trunk/include/linux/ftrace.h
+++ b/trunk/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