From a9fd85f3a8ecd2d14dd2dac189ba194959c4c0c0 Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Sun, 10 Jul 2011 10:39:14 +0200 Subject: [PATCH] --- yaml --- r: 256939 b: refs/heads/master c: 18b4f3f5d058b590e7189027eeb5d897742ade0a h: refs/heads/master i: 256937: 0f65ec42314c5376669464d5c9acfd34626c0066 256935: 65d33f4589a8e45a9f306012b1e130c9f4a695e6 v: v3 --- [refs] | 2 +- trunk/drivers/base/power/domain.c | 2 +- trunk/include/linux/pm_domain.h | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 6126f8e8124a..27d250e0793e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9416f03fd9f809225a90f63b2fbc86f90010eab +refs/heads/master: 18b4f3f5d058b590e7189027eeb5d897742ade0a diff --git a/trunk/drivers/base/power/domain.c b/trunk/drivers/base/power/domain.c index 1aed94c73cfc..1f1a7d85f29d 100644 --- a/trunk/drivers/base/power/domain.c +++ b/trunk/drivers/base/power/domain.c @@ -37,7 +37,7 @@ static void genpd_sd_counter_dec(struct generic_pm_domain *genpd) * Restore power to @genpd and all of its parents so that it is possible to * resume a device belonging to it. */ -static int pm_genpd_poweron(struct generic_pm_domain *genpd) +int pm_genpd_poweron(struct generic_pm_domain *genpd) { int ret = 0; diff --git a/trunk/include/linux/pm_domain.h b/trunk/include/linux/pm_domain.h index 98491ee35102..14fb0953fa47 100644 --- a/trunk/include/linux/pm_domain.h +++ b/trunk/include/linux/pm_domain.h @@ -63,6 +63,7 @@ extern int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd, struct generic_pm_domain *target); 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); #else static inline int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev) @@ -86,6 +87,10 @@ static inline int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd, } static inline void pm_genpd_init(struct generic_pm_domain *genpd, struct dev_power_governor *gov, bool is_off) {} +static inline int pm_genpd_poweron(struct generic_pm_domain *genpd) +{ + return -ENOSYS; +} #endif #endif /* _LINUX_PM_DOMAIN_H */