Skip to contentSkip to conversation

Unbreak S3

PM Pavel Machek 2 participants 2 messages Aug 6, 2003 Kbuild

lore
Share & tools
lore

Pavel Machek

author
#0 lore raw

Hi!

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

usr/src/linux/drivers/acpi/sleep/main.c renamed from usr/src/tmp/linux/drivers/acpi/sleep/main.c +1 -2
@@ -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;
Signature · 2 lines
When do you have a heart between your knees?
[Johanka's followup: and *two* hearts?]
#1 lore raw
Quoted 3 lines

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

Thanks, both applied.

-pat