tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 13 Dec 2014 01:23:30 +0000 (02:23 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 13 Dec 2014 01:23:30 +0000 (02:23 +0100)
After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so files that are
build conditionally if CONFIG_PM_RUNTIME is set may now be build
if CONFIG_PM is set.

Replace CONFIG_PM_RUNTIME with CONFIG_PM in kernel/trace/Makefile
for this reason.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Steven Rostedt <rostedt@goodmis.org.
kernel/trace/Makefile

index 67d6369ddf83e632dcd014358c7d71bd17816fe7..979ccde26720410592439cf7fe99e28bb3eb0e70 100644 (file)
@@ -55,7 +55,7 @@ obj-$(CONFIG_EVENT_TRACING) += trace_events_filter.o
 obj-$(CONFIG_EVENT_TRACING) += trace_events_trigger.o
 obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
 obj-$(CONFIG_TRACEPOINTS) += power-traces.o
-ifeq ($(CONFIG_PM_RUNTIME),y)
+ifeq ($(CONFIG_PM),y)
 obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o
 endif
 ifeq ($(CONFIG_TRACING),y)