diff --git a/[refs] b/[refs]
index d22f042b4478..be362270d9e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b6e4d56bf71866a2b58daa8323cf747988ce7e4
+refs/heads/master: f3384b28a05624783b53836ccfed95ecde66a7ad
diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
index e0cea282e0c5..b58f43bec363 100644
--- a/trunk/kernel/trace/Kconfig
+++ b/trunk/kernel/trace/Kconfig
@@ -8,7 +8,6 @@ config NOP_TRACER
 
 config HAVE_FUNCTION_TRACER
 	bool
-	select NOP_TRACER
 
 config HAVE_DYNAMIC_FTRACE
 	bool
@@ -28,6 +27,7 @@ config TRACING
 	select RING_BUFFER
 	select STACKTRACE
 	select TRACEPOINTS
+	select NOP_TRACER
 
 menu "Tracers"