diff --git a/[refs] b/[refs]
index 6052f00afd11..ae71265b2ab6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3dc2f14622a06488f11452b6efd1e02c5a8548b
+refs/heads/master: 2a5306cc5f383b0e7414c75e458111afd4a563a4
diff --git a/trunk/kernel/trace/Makefile b/trunk/kernel/trace/Makefile
index 56bdab5b3793..f49405f842f4 100644
--- a/trunk/kernel/trace/Makefile
+++ b/trunk/kernel/trace/Makefile
@@ -53,7 +53,9 @@ endif
 obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
 obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
 obj-$(CONFIG_TRACEPOINTS) += power-traces.o
+ifeq ($(CONFIG_PM_RUNTIME),y)
 obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o
+endif
 ifeq ($(CONFIG_TRACING),y)
 obj-$(CONFIG_KGDB_KDB) += trace_kdb.o
 endif