diff --git a/[refs] b/[refs] index 3a8df163bcf9..2d67ccb02beb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b31db8a16fa0d4d6a0fa42d044e7a4f4dad3641 +refs/heads/master: 62bcb91573425975d6ad2389d7ab1d8feca88ab4 diff --git a/trunk/include/linux/pm.h b/trunk/include/linux/pm.h index c1756dfeb8c5..dd9c7ab38270 100644 --- a/trunk/include/linux/pm.h +++ b/trunk/include/linux/pm.h @@ -572,4 +572,11 @@ extern unsigned int pm_flags; #define PM_APM 1 #define PM_ACPI 2 +extern int pm_generic_suspend(struct device *dev); +extern int pm_generic_resume(struct device *dev); +extern int pm_generic_freeze(struct device *dev); +extern int pm_generic_thaw(struct device *dev); +extern int pm_generic_restore(struct device *dev); +extern int pm_generic_poweroff(struct device *dev); + #endif /* _LINUX_PM_H */