diff options
| author | Daniel Drake <dsd@laptop.org> | 2011-07-24 18:34:30 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-24 20:16:05 +0200 |
| commit | 07d5b38e14b7ff98eb52e4a6db4e20abcc608da3 (patch) | |
| tree | 0e0f48bb0033d67acee4092e9d525ab87ef240ee /arch/x86 | |
| parent | d8d01a6378db6e3eeb8777a8769c69e455635dc3 (diff) | |
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>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | 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 a5990ebadbe..2b235b77d9a 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; } |