---

yaml --- r: 267037 b: refs/heads/master c: 2a5306c h: refs/heads/master i: 267035: 79f0955 v: v3
git-mirror · Sep 29, 2011 · e34d928 · e34d928
1 parent 8a8939d
commit e34d928
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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