Commit 49bb8042 authored by Patrick Mochel's avatar Patrick Mochel

[power] Fix #ifdef in ACPI sleep code.

Remove dependency on CONFIG_SOFTWARE_SUSPEND, since CONFIG_ACPI_SLEEP is 
sufficient. 

From Pavel Machek.
parent 0bc118af
...@@ -22,6 +22,7 @@ ACPI_MODULE_NAME ("sleep") ...@@ -22,6 +22,7 @@ ACPI_MODULE_NAME ("sleep")
u8 sleep_states[ACPI_S_STATE_COUNT]; u8 sleep_states[ACPI_S_STATE_COUNT];
extern void do_suspend_lowlevel_s4bios(int); extern void do_suspend_lowlevel_s4bios(int);
extern void do_suspend_lowlevel(int);
/** /**
* acpi_system_restore_state - OS-specific restoration of state * acpi_system_restore_state - OS-specific restoration of state
...@@ -181,12 +182,11 @@ acpi_system_suspend( ...@@ -181,12 +182,11 @@ acpi_system_suspend(
status = acpi_enter_sleep_state(state); status = acpi_enter_sleep_state(state);
break; break;
#ifdef CONFIG_SOFTWARE_SUSPEND
case ACPI_STATE_S2: case ACPI_STATE_S2:
case ACPI_STATE_S3: case ACPI_STATE_S3:
do_suspend_lowlevel(0); do_suspend_lowlevel(0);
break; break;
#endif
case ACPI_STATE_S4: case ACPI_STATE_S4:
do_suspend_lowlevel_s4bios(0); do_suspend_lowlevel_s4bios(0);
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment