diff options
| author | Len Brown <len.brown@intel.com> | 2008-11-26 17:55:15 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-26 17:55:15 -0500 |
| commit | 3bdca1b863c1ebcb2244fc0cb683876d7330e62b (patch) | |
| tree | b0365909d18684e2ac7af4b6103f81f3c290a7f1 /drivers/acpi | |
| parent | 65df78473ffbf3bff5e2034df1638acc4f3ddd50 (diff) | |
| download | kernel_samsung_crespo-3bdca1b863c1ebcb2244fc0cb683876d7330e62b.zip kernel_samsung_crespo-3bdca1b863c1ebcb2244fc0cb683876d7330e62b.tar.gz kernel_samsung_crespo-3bdca1b863c1ebcb2244fc0cb683876d7330e62b.tar.bz2 | |
Revert "ACPI: don't enable control method power button as wakeup device when Fixed Power button is used"
This reverts commit faee816b1502385dc9bc5abf2960d1cc645844d1.
http://bugzilla.kernel.org/show_bug.cgi?id=12091
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/scan.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index bd5253e..39b7233 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -751,16 +751,6 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device) if (!acpi_match_device_ids(device, button_device_ids)) device->wakeup.flags.run_wake = 1; - /* - * Don't set Power button GPE as run_wake - * if Fixed Power button is used - */ - if (!strcmp(device->pnp.hardware_id, "PNP0C0C") && - !(acpi_gbl_FADT.flags & ACPI_FADT_POWER_BUTTON)) { - device->wakeup.flags.run_wake = 0; - device->wakeup.flags.valid = 0; - } - end: if (ACPI_FAILURE(status)) device->flags.wake_capable = 0; |