aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/scan.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-01-12 04:55:46 -0500
committerLen Brown <len.brown@intel.com>2011-01-12 04:55:46 -0500
commitfb4af417cce9ff87abf33a6bb9a0cf613e285364 (patch)
tree328ce710c6e6acf7b58145da939fb3cc91d188c9 /drivers/acpi/scan.c
parent07bf280521bb06bc8e64f0b998fc391253fcb959 (diff)
parent7b330707dddab1ad772898c1c82516342a551173 (diff)
downloadlinux-linaro-android-fb4af417cce9ff87abf33a6bb9a0cf613e285364.tar.gz
Merge branch 'wakeup-etc-rafael' into release
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r--drivers/acpi/scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 148e7492d73..64d4da0d6d5 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -803,7 +803,7 @@ static void acpi_bus_set_run_wake_flags(struct acpi_device *device)
/* Power button, Lid switch always enable wakeup */
if (!acpi_match_device_ids(device, button_device_ids)) {
device->wakeup.flags.run_wake = 1;
- device->wakeup.flags.always_enabled = 1;
+ device_set_wakeup_capable(&device->dev, true);
return;
}