summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2013-04-23 18:29:02 +0300
committerDan Willemsen <dwillemsen@nvidia.com>2013-09-14 13:25:27 -0700
commit85922f4cb80d759654c7a9404ab5640f85ce6a00 (patch)
treec7824860223ffc755494e465cefbf71f89c36b7e /drivers/base
parentae2c979f1ed44035818c4e0730fc5efb269f8071 (diff)
PM/domains: Fix delayed power off dependency
Delayed power off needs to depend both on PM_SLEEP and PM_RUNTIME. Change-Id: Ibecb5a9376713a05386585659f79dcd959492613 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: http://git-master/r/222111 Reviewed-on: http://git-master/r/230164 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/power/domain.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 56535fb42dd0..280e5e5b8042 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -2216,6 +2216,7 @@ static int pm_genpd_default_thaw(struct device *dev)
return cb ? cb(dev) : pm_generic_thaw(dev);
}
+#ifdef CONFIG_PM_RUNTIME
static int pm_genpd_suspend_notifier(struct notifier_block *notifier,
unsigned long pm_event, void *unused)
{
@@ -2245,6 +2246,7 @@ static int pm_genpd_suspend_notifier(struct notifier_block *notifier,
return NOTIFY_DONE;
}
+#endif
#else /* !CONFIG_PM_SLEEP */