Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / acpi / pci_irq.c

diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 5f1fdca..5277a0e 100644 (file)
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -488,7 +488,7 @@ void acpi_pci_irq_disable(struct pci_dev *dev)
        /* Keep IOAPIC pin configuration when suspending */
        if (dev->dev.power.is_prepared)
                return;
-#ifdef CONFIG_PM_RUNTIME
+#ifdef CONFIG_PM
        if (dev->dev.power.runtime_status == RPM_SUSPENDING)
                return;
 #endif