Commit 798bc6d8 authored Dec 13, 2014 by Rafael J. Wysocki

tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM



After commit b2b49ccb (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.>

parent 16394fd0

kernel/trace/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)

Admin message