diff options
| author | Rafael J. Wysocki | 2017-11-13 01:41:20 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki | 2017-11-13 01:41:20 +0100 |
| commit | 05d658b5b57214944067fb4f62bce59200bf496f (patch) | |
| tree | f2aa2537874ab5c4e37e6e7073e857150e9e1f08 /include/linux/pm.h | |
| parent | Merge branch 'acpi-pm' (diff) | |
| parent | freezer: Fix typo in freezable_schedule_timeout() comment (diff) | |
| download | kernel-qcow2-linux-05d658b5b57214944067fb4f62bce59200bf496f.tar.gz kernel-qcow2-linux-05d658b5b57214944067fb4f62bce59200bf496f.tar.xz kernel-qcow2-linux-05d658b5b57214944067fb4f62bce59200bf496f.zip | |
Merge branch 'pm-sleep'
* pm-sleep:
freezer: Fix typo in freezable_schedule_timeout() comment
PM / s2idle: Clear the events_check_enabled flag
PM / sleep: Remove pm_complete_with_resume_check()
PM: ARM: locomo: Drop suspend and resume bus type callbacks
PM: Use a more common logging style
PM: Document rules on using pm_runtime_resume() in system suspend callbacks
Diffstat (limited to 'include/linux/pm.h')
| -rw-r--r-- | include/linux/pm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 47ded8aa8a5d..a0ceeccf2846 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -736,7 +736,6 @@ extern int pm_generic_poweroff_noirq(struct device *dev); extern int pm_generic_poweroff_late(struct device *dev); extern int pm_generic_poweroff(struct device *dev); extern void pm_generic_complete(struct device *dev); -extern void pm_complete_with_resume_check(struct device *dev); #else /* !CONFIG_PM_SLEEP */ |