diff --git a/[refs] b/[refs] index df3f91bbda4e..ec129fe202d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62d4490294e3de7015f715c00af992d7b6a6e22c +refs/heads/master: 8951ef021904752a843a81fee785f1b180f31c07 diff --git a/trunk/drivers/base/power/domain.c b/trunk/drivers/base/power/domain.c index 9727bc56320a..4f8e0d2e7780 100644 --- a/trunk/drivers/base/power/domain.c +++ b/trunk/drivers/base/power/domain.c @@ -159,7 +159,7 @@ static void genpd_recalc_cpu_exit_latency(struct generic_pm_domain *genpd) * Restore power to @genpd and all of its masters so that it is possible to * resume a device belonging to it. */ -int __pm_genpd_poweron(struct generic_pm_domain *genpd) +static int __pm_genpd_poweron(struct generic_pm_domain *genpd) __releases(&genpd->lock) __acquires(&genpd->lock) { struct gpd_link *link;