diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-01-06 23:35:10 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-07 01:18:00 -0500 |
| commit | 7fa69baf29de8c77a6b32c054df2abb8f11f8aa4 (patch) | |
| tree | becc4b300b74d3bd85ffdd0e536acf8554cf3872 /drivers/acpi/glue.c | |
| parent | f2b56bc808addb908a5bf435d9b942c02af9a7c4 (diff) | |
| download | kernel_samsung_aries-7fa69baf29de8c77a6b32c054df2abb8f11f8aa4.zip kernel_samsung_aries-7fa69baf29de8c77a6b32c054df2abb8f11f8aa4.tar.gz kernel_samsung_aries-7fa69baf29de8c77a6b32c054df2abb8f11f8aa4.tar.bz2 | |
ACPI / PM: Drop special ACPI wakeup flags
Drop special ACPI wakeup flags, wakeup.state.enabled and
wakeup.flags.always_enabled, that aren't necessary any more after
we've started to use standard device wakeup flags for handling ACPI
wakeup devices.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/glue.c')
| -rw-r--r-- | drivers/acpi/glue.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 78b0164..7c47ed5 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c @@ -167,11 +167,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) { + if (acpi_dev->wakeup.flags.valid) device_set_wakeup_capable(dev, true); - device_set_wakeup_enable(dev, - acpi_dev->wakeup.state.enabled); - } } return 0; |