From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 13 Dec 2014 00:54:59 +0000 (+0100)
Subject: x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=16394fd031142c9ef31e2eb8cd8c4bd07e258bac;p=linux.git

x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c

After commit b2b49ccbdd54 (PM: Kconfig: Set PM_RUNTIME if PM_SLEEP is
selected) PM_RUNTIME is always set if PM is set, so #ifdef blocks
depending on CONFIG_PM_RUNTIME may now be changed to depend on
CONFIG_PM.

Replace CONFIG_PM_RUNTIME with CONFIG_PM in x86/kernel/apic/io_apic.c.

Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 7ffe0a2b870f0..a6745e7567298 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -3968,7 +3968,7 @@ bool mp_should_keep_irq(struct device *dev)
 {
 	if (dev->power.is_prepared)
 		return true;
-#ifdef	CONFIG_PM_RUNTIME
+#ifdef	CONFIG_PM
 	if (dev->power.runtime_status == RPM_SUSPENDING)
 		return true;
 #endif