x86, olpc-xo15-sci: Enable EC wakeup capability

Some recent changes to the way that ACPI handles wakeup flags
means that the XO15EC ACPI device is not wakeup-capable by
default so device_set_wakeup_enable() does nothing.

Use device_init_wakeup() to mark the device as wakeup capable,
and to enable wakeups.

Signed-off-by: Daniel Drake <dsd@laptop.org>
Link: http://lkml.kernel.org/r/20110724173430.BE03C9D401C@zog.reactivated.net
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c
index a5990ebadbe4bf0d5147d734499276b4d2c88874..2b235b77d9abb0b49d5b6262fb21786eb74b9cea 100644 (file)
--- a/arch/x86/platform/olpc/olpc-xo15-sci.c
+++ b/arch/x86/platform/olpc/olpc-xo15-sci.c
@@ -120,7 +120,7 @@ static int xo15_sci_add(struct acpi_device *device)
 
        /* Enable wake-on-EC */
        if (device->wakeup.flags.valid)
-               device_set_wakeup_enable(&device->dev, true);
+               device_init_wakeup(&device->dev, true);
 
        return 0;
 }