diff -ruNp 
301-proc-acpi-sleep-activate-hook.patch-old/drivers/acpi/sleep/proc.c 
301-proc-acpi-sleep-activate-hook.patch-new/drivers/acpi/sleep/proc.c
--- 301-proc-acpi-sleep-activate-hook.patch-old/drivers/acpi/sleep/proc.c       
2005-06-20 11:46:50.000000000 +1000
+++ 301-proc-acpi-sleep-activate-hook.patch-new/drivers/acpi/sleep/proc.c       
2005-07-04 23:14:18.000000000 +1000
@@ -68,6 +68,17 @@ acpi_system_write_sleep (
                goto Done;
        }
        state = simple_strtoul(str, NULL, 0);
+#ifdef CONFIG_SUSPEND2
+       /* 
+        * I used to put this after the CONFIG_SOFTWARE_SUSPEND
+        * test, but people who compile in suspend2 usually want
+        * to use it instead of swsusp.   --NC
+        */
+       if (state == 4) {
+               suspend2_try_suspend();
+               goto Done;
+       }
+#endif
 #ifdef CONFIG_SOFTWARE_SUSPEND
        if (state == 4) {
                error = software_suspend();

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to