History

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

Rafael J. Wysocki committed 9 years ago

Commit ff7e5933 parents 7a308bb e326ce0 1443ebb5 files · +16 −16Browse files

Showing the changes to include/linux (1 of 5 files). Show all

Unified · Split

include/linux/suspend.h+0−2
@@ -194,8 +194,6 @@ struct platform_freeze_ops { · 193 unmodified lines
194};194};
195 195
196#ifdef CONFIG_SUSPEND196#ifdef CONFIG_SUSPEND
197extern suspend_state_t mem_sleep_default;
198
199/**197/**
200 * suspend_set_ops - set platform dependent suspend operations198 * suspend_set_ops - set platform dependent suspend operations
201 * @ops: The new suspend operations to set.199 * @ops: The new suspend operations to set.