diff --git a/[refs] b/[refs]
index cf209b9290fe..3a17a23496de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d09daa55d2e9bab7e7d30f0d05e5a7bc60b2a4a
+refs/heads/master: c1d2327b36f2261ffa8ff7227321ba900c7eee7f
diff --git a/trunk/kernel/trace/Kconfig b/trunk/kernel/trace/Kconfig
index ebc158e6d59a..f3005717bcd0 100644
--- a/trunk/kernel/trace/Kconfig
+++ b/trunk/kernel/trace/Kconfig
@@ -32,6 +32,7 @@ config IRQSOFF_TRACER
 	default n
 	depends on TRACE_IRQFLAGS_SUPPORT
 	depends on GENERIC_TIME
+	depends on HAVE_FTRACE
 	select TRACE_IRQFLAGS
 	select TRACING
 	select TRACER_MAX_TRACE
@@ -54,6 +55,7 @@ config PREEMPT_TRACER
 	default n
 	depends on GENERIC_TIME
 	depends on PREEMPT
+	depends on HAVE_FTRACE
 	select TRACING
 	select TRACER_MAX_TRACE
 	help
@@ -72,6 +74,7 @@ config PREEMPT_TRACER
 
 config SCHED_TRACER
 	bool "Scheduling Latency Tracer"
+	depends on HAVE_FTRACE
 	select TRACING
 	select CONTEXT_SWITCH_TRACER
 	select TRACER_MAX_TRACE
@@ -81,6 +84,7 @@ config SCHED_TRACER
 
 config CONTEXT_SWITCH_TRACER
 	bool "Trace process context switches"
+	depends on HAVE_FTRACE
 	select TRACING
 	select MARKERS
 	help