]> Pileus Git - ~andy/linux/commitdiff
PM / Tracing: build rpm-traces.c only if CONFIG_PM_RUNTIME is set
authorMing Lei <ming.lei@canonical.com>
Thu, 29 Sep 2011 20:07:23 +0000 (22:07 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Thu, 29 Sep 2011 20:07:23 +0000 (22:07 +0200)
Do not build kernel/trace/rpm-traces.c if CONFIG_PM_RUNTIME is not
set, which avoids a build failure.

[rjw: Added the changelog and modified the subject slightly.]

Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
kernel/trace/Makefile

index 56bdab5b379387eb95b292445462087494487a4a..f49405f842f4ef6b3f971ad183db9670e3bd9488 100644 (file)
@@ -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