From 449acf925d70173058170ad81e622f5e0f3dac30 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Wed, 26 Nov 2008 17:55:15 -0500 Subject: [PATCH] --- yaml --- r: 119348 b: refs/heads/master c: 3bdca1b863c1ebcb2244fc0cb683876d7330e62b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/scan.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 40d3de84b444..64cac114240b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65df78473ffbf3bff5e2034df1638acc4f3ddd50 +refs/heads/master: 3bdca1b863c1ebcb2244fc0cb683876d7330e62b diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c index bd5253ee5c85..39b7233c3485 100644 --- a/trunk/drivers/acpi/scan.c +++ b/trunk/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;