[tip:x86/olpc] x86, olpc-xo15-sci: Enable EC wakeup capability

[tip-bot for Daniel Drake]

Commit-ID:  07d5b38e14b7ff98eb52e4a6db4e20abcc608da3
Gitweb:     http://git.kernel.org/tip/07d5b38e14b7ff98eb52e4a6db4e20abcc608da3
Author:     Daniel Drake <dsd@xxxxxxxxxx>
AuthorDate: Sun, 24 Jul 2011 18:34:30 +0100
Committer:  Ingo Molnar <mingo@xxxxxxx>
CommitDate: Sun, 24 Jul 2011 20:16:05 +0200

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@xxxxxxxxxx>
Link: http://lkml.kernel.org/r/20110724173430.BE03C9D401C@xxxxxxxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
 arch/x86/platform/olpc/olpc-xo15-sci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/platform/olpc/olpc-xo15-sci.c b/arch/x86/platform/olpc/olpc-xo15-sci.c
index a5990eb..2b235b7 100644
--- 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;
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/