2003-08-06 10:37:24

by Pavel Machek

Subject: [PM] Unbreak S3

Hi!

SOFTWARE_SUSPEND/ACPI_SLEEP split was not ideal. As ACPI_SLEEP is now
independant, #ifdef is wrong. Please apply,
Pavel

--- /usr/src/tmp/linux/drivers/acpi/sleep/main.c 2003-08-06 12:25:17.000000000 +0200
+++ /usr/src/linux/drivers/acpi/sleep/main.c 2003-08-06 12:12:58.000000000 +0200
@@ -191,12 +191,11 @@
status = acpi_enter_sleep_state(state);
break;

-#ifdef CONFIG_SOFTWARE_SUSPEND
case ACPI_STATE_S2:
case ACPI_STATE_S3:
do_suspend_lowlevel(0);
break;
-#endif
+
case ACPI_STATE_S4:
do_suspend_lowlevel_s4bios(0);
break;

--
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]

2003-08-06 14:14:05

by Patrick Mochel

Subject: Re: [PM] Unbreak S3

> SOFTWARE_SUSPEND/ACPI_SLEEP split was not ideal. As ACPI_SLEEP is now
> independant, #ifdef is wrong. Please apply,

Thanks, both applied.


-pat