Merge branch 'linus' into x86/paravirt-spinlocks

[pandora-kernel.git] / drivers / acpi / glue.c

diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 6d18ca3..2f173e8 100644 (file)
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
@@ -166,6 +166,8 @@ static int acpi_bind_one(struct device *dev, acpi_handle handle)
                                "firmware_node");
                ret = sysfs_create_link(&acpi_dev->dev.kobj, &dev->kobj,
                                "physical_node");
+               if (acpi_dev->wakeup.flags.valid)
+                       device_set_wakeup_capable(dev, true);
        }
 
        return 0;
@@ -333,9 +335,6 @@ static int __init acpi_rtc_init(void)
 {
        struct device *dev = get_rtc_dev();
 
-       if (acpi_disabled)
-               return 0;
-
        if (acpi_disabled)
                return 0;