diff --git a/[refs] b/[refs]
index 0aaf37ee04ea..62c7fda39409 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ae5b8790037d05d32746f521af146c32089bfec
+refs/heads/master: 4ed9f0716e46bb9646f26e73f4a1b5b24db7947a
diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
index 3ee28db69be6..3fa36d2bc290 100644
--- a/trunk/kernel/trace/Kconfig
+++ b/trunk/kernel/trace/Kconfig
@@ -77,7 +77,12 @@ config TRACING_SUPPORT
 
 if TRACING_SUPPORT
 
-menu "Tracers"
+menuconfig FTRACE
+	bool "Tracers"
+	help
+	 Enable the kernel tracing infrastructure.
+
+if FTRACE
 
 config FUNCTION_TRACER
 	bool "Kernel Function Tracer"
@@ -462,7 +467,7 @@ config MMIOTRACE_TEST
 
 	  Say N, unless you absolutely know what you are doing.
 
-endmenu
+endif # FTRACE
 
 endif # TRACING_SUPPORT