diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-11-19 23:33:59 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-01 18:30:53 -0500 |
| commit | 964756a52f4cf0417d515b7f01eec69db8cb0fe2 (patch) | |
| tree | a52d13bc9186d473cd89eacc7b72ffd88afa8375 /drivers/acpi/sleep | |
| parent | 3010f8caa48ed38679cc32b0d8e84b82cb8d9980 (diff) | |
| download | kernel_samsung_aries-964756a52f4cf0417d515b7f01eec69db8cb0fe2.zip kernel_samsung_aries-964756a52f4cf0417d515b7f01eec69db8cb0fe2.tar.gz kernel_samsung_aries-964756a52f4cf0417d515b7f01eec69db8cb0fe2.tar.bz2 | |
ACPI: Fix mismerge in acpi_hibernation_finish
Some code in acpi_hibernation_finish() was moved to acpi_hibernation_leave(),
but the old copy had been left (it's harmless, but also useless). Remove it.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/sleep')
| -rw-r--r-- | drivers/acpi/sleep/main.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c index 2c0b663..cbfa058 100644 --- a/drivers/acpi/sleep/main.c +++ b/drivers/acpi/sleep/main.c @@ -267,11 +267,6 @@ static void acpi_hibernation_leave(void) static void acpi_hibernation_finish(void) { - /* - * If ACPI is not enabled by the BIOS and the boot kernel, we need to - * enable it here. - */ - acpi_enable(); acpi_disable_wakeup_device(ACPI_STATE_S4); acpi_leave_sleep_state(ACPI_STATE_S4); |