Merge branches 'pm-cpufreq', 'pm-pci' and 'pm-sleep'
Merge fixes for the ondemand and conservative cpufreq governors, PCI power management and system wakeup framework. * pm-cpufreq: cpufreq: governor: Avoid accessing invalid governor_data * pm-pci: PCI / ACPI / PM: Resume all bridges on suspend-to-RAM * pm-sleep: PM / sleep: wakeup: Fix build error caused by missing SRCU support
This commit is contained in:
commit
01ac7c4c2e
3 changed files with 13 additions and 6 deletions
|
|
@ -105,6 +105,7 @@ config PM_SLEEP
|
|||
def_bool y
|
||||
depends on SUSPEND || HIBERNATE_CALLBACKS
|
||||
select PM
|
||||
select SRCU
|
||||
|
||||
config PM_SLEEP_SMP
|
||||
def_bool y
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue