Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 798bc6d8d50ff26a5033be0cb9c63727943b49fe

Authored by Rafael J. Wysocki
1 parent 16394fd031
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM 

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.

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

kernel/trace/Makefile
Diff comments   View file @ 798bc6d
... ... @@ -55,7 +55,7 @@
55 55 obj-$(CONFIG_EVENT_TRACING) += trace_events_trigger.o
56 56 obj-$(CONFIG_KPROBE_EVENT) += trace_kprobe.o
57 57 obj-$(CONFIG_TRACEPOINTS) += power-traces.o
58   -ifeq ($(CONFIG_PM_RUNTIME),y)
  58 +ifeq ($(CONFIG_PM),y)
59 59 obj-$(CONFIG_TRACEPOINTS) += rpm-traces.o
60 60 endif
61 61 ifeq ($(CONFIG_TRACING),y)