diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-18 22:46:17 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-05-18 22:46:17 +0400 |
| commit | 06132ee903e3b0fe3541970e017762a3df3e0551 (patch) | |
| tree | 11ed07b6df259fa42797b723600fc70da10c4503 /include/linux | |
| parent | 351520a9ebfdf2f36cd97c1192f280e0ac7fdcfc (diff) | |
| parent | ca1d72f033d4a89e60db25f680896c76c721062b (diff) | |
| download | linux-06132ee903e3b0fe3541970e017762a3df3e0551.tar.xz | |
Merge branch 'pm-domains'
* pm-domains:
PM / Domains: Make it possible to add devices to inactive domains
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/pm_domain.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 1e994eeacdf3..30f794eb3826 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -146,6 +146,7 @@ static inline int pm_genpd_of_add_device(struct device_node *genpd_node, extern int pm_genpd_remove_device(struct generic_pm_domain *genpd, struct device *dev); extern void pm_genpd_dev_always_on(struct device *dev, bool val); +extern void pm_genpd_dev_need_restore(struct device *dev, bool val); extern int pm_genpd_add_subdomain(struct generic_pm_domain *genpd, struct generic_pm_domain *new_subdomain); extern int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd, @@ -189,6 +190,7 @@ static inline int pm_genpd_remove_device(struct generic_pm_domain *genpd, return -ENOSYS; } static inline void pm_genpd_dev_always_on(struct device *dev, bool val) {} +static inline void pm_genpd_dev_need_restore(struct device *dev, bool val) {} static inline int pm_genpd_add_subdomain(struct generic_pm_domain *genpd, struct generic_pm_domain *new_sd) { |