diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-17 22:15:25 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-17 22:15:25 +0200 |
| commit | b4fd4ae6c6420c18e4bae2c294b7e06f5ff5210f (patch) | |
| tree | a948e1f99dbce5d34da04b3e655d3655335848d7 /include | |
| parent | mm: fix __page_to_pfn for a const struct page argument (diff) | |
| parent | PM / Domains: Fix build for CONFIG_PM_RUNTIME unset (diff) | |
| download | linux-b4fd4ae6c6420c18e4bae2c294b7e06f5ff5210f.tar.xz linux-b4fd4ae6c6420c18e4bae2c294b7e06f5ff5210f.zip | |
Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / Domains: Fix build for CONFIG_PM_RUNTIME unset
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pm_domain.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index 21097cb086fe..f9ec1736a116 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -72,8 +72,6 @@ extern int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd, extern void pm_genpd_init(struct generic_pm_domain *genpd, struct dev_power_governor *gov, bool is_off); extern int pm_genpd_poweron(struct generic_pm_domain *genpd); -extern void pm_genpd_poweroff_unused(void); -extern void genpd_queue_power_off_work(struct generic_pm_domain *genpd); #else static inline int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev) @@ -101,8 +99,14 @@ static inline int pm_genpd_poweron(struct generic_pm_domain *genpd) { return -ENOSYS; } -static inline void pm_genpd_poweroff_unused(void) {} +#endif + +#ifdef CONFIG_PM_GENERIC_DOMAINS_RUNTIME +extern void genpd_queue_power_off_work(struct generic_pm_domain *genpd); +extern void pm_genpd_poweroff_unused(void); +#else static inline void genpd_queue_power_off_work(struct generic_pm_domain *gpd) {} +static inline void pm_genpd_poweroff_unused(void) {} #endif #endif /* _LINUX_PM_DOMAIN_H */ |