From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 27 May 2008 23:22:08 +0000 (+0200)
Subject: ftrace: fix merge
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b1829d2705daa7cb72eb1e08bdc8b7e9fad34266;p=mv-sheeva.git

ftrace: fix merge

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

diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h
index ffbbd54a720..b482fe88bc0 100644
--- 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