diff --git a/[refs] b/[refs]
index 0445e6e48361..b544e3b20945 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fd6da10a617f483348ee32bcfe53fd20c302eca1
+refs/heads/master: 96d17980fabeb757706d2d6db5a28580a6156bfc
diff --git a/trunk/samples/Kconfig b/trunk/samples/Kconfig
index 93f41c051092..b75d28cba3f7 100644
--- a/trunk/samples/Kconfig
+++ b/trunk/samples/Kconfig
@@ -20,9 +20,8 @@ config SAMPLE_TRACEPOINTS
 	  This build tracepoints example modules.
 
 config SAMPLE_TRACE_EVENTS
-	tristate "Build trace_events examples"
-	depends on EVENT_TRACING
-	default m
+	tristate "Build trace_events examples -- loadable modules only"
+	depends on EVENT_TRACING && m
 	help
 	  This build trace event example modules.