Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=964756a52f4cf0417d515b7f01eec69db8cb0fe2
Commit:     964756a52f4cf0417d515b7f01eec69db8cb0fe2
Parent:     3010f8caa48ed38679cc32b0d8e84b82cb8d9980
Author:     Rafael J. Wysocki <[EMAIL PROTECTED]>
AuthorDate: Mon Nov 19 23:33:59 2007 +0100
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Fri Feb 1 18:30:53 2008 -0500

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
 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);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to