Merge branches 'pm-sleep' and 'pm-cpufreq'
* pm-sleep: Revert "PM / sleep / ACPI: Use the ACPI_FADT_LOW_POWER_S0 flag" * pm-cpufreq: cpufreq: intel_pstate: Fix sysfs limits enforcement for performance policy
This commit is contained in:
commit
ff7e593c9c
5 changed files with 16 additions and 16 deletions
|
|
@ -194,8 +194,6 @@ struct platform_freeze_ops {
|
|||
};
|
||||
|
||||
#ifdef CONFIG_SUSPEND
|
||||
extern suspend_state_t mem_sleep_default;
|
||||
|
||||
/**
|
||||
* suspend_set_ops - set platform dependent suspend operations
|
||||
* @ops: The new suspend operations to set.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue