ACPI / PM: Add more run-time wake-up fields

[safe/jmp/linux-2.6] / drivers / acpi / wakeup.c

diff --git a/drivers/acpi/wakeup.c b/drivers/acpi/wakeup.c
index 6783986..4b9d339 100644 (file)
--- a/drivers/acpi/wakeup.c
+++ b/drivers/acpi/wakeup.c
@@ -110,7 +110,8 @@ int __init acpi_wakeup_device_init(void)
                                                       struct acpi_device,
                                                       wakeup_list);
                /* In case user doesn't load button driver */
-               if (!dev->wakeup.flags.run_wake || dev->wakeup.state.enabled)
+               if (!dev->wakeup.flags.always_enabled ||
+                   dev->wakeup.state.enabled)
                        continue;
                acpi_enable_gpe(dev->wakeup.gpe_device, dev->wakeup.gpe_number,
                                ACPI_GPE_TYPE_WAKE);