From bd0e3a1abf42bdde62d42cacd93a986f76675eb2 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Sat, 14 Jan 2012 00:39:36 +0100
Subject: [PATCH] --- yaml --- r: 285837 b: refs/heads/master c:
 e59a8db8d9b7c02e0bbefbeb18a3836288a97b8a h: refs/heads/master i:   285835:
 5cbfade22d7e52b8fa7235656baa19207b6c3ef9 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/base/power/domain_governor.c | 24 +++++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 83186246d0e0..5f75317f9ba2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f1d6986bae57b6d11e2c9ce5e66b6c6b0e3684d
+refs/heads/master: e59a8db8d9b7c02e0bbefbeb18a3836288a97b8a
diff --git a/trunk/drivers/base/power/domain_governor.c b/trunk/drivers/base/power/domain_governor.c
index 51527ee92d10..66a265bf5867 100644
--- a/trunk/drivers/base/power/domain_governor.c
+++ b/trunk/drivers/base/power/domain_governor.c
@@ -12,6 +12,8 @@
 #include <linux/pm_qos.h>
 #include <linux/hrtimer.h>
 
+#ifdef CONFIG_PM_RUNTIME
+
 /**
  * default_stop_ok - Default PM domain governor routine for stopping devices.
  * @dev: Device to check.
@@ -137,16 +139,28 @@ static bool default_power_down_ok(struct dev_pm_domain *pd)
 	return true;
 }
 
-struct dev_power_governor simple_qos_governor = {
-	.stop_ok = default_stop_ok,
-	.power_down_ok = default_power_down_ok,
-};
-
 static bool always_on_power_down_ok(struct dev_pm_domain *domain)
 {
 	return false;
 }
 
+#else /* !CONFIG_PM_RUNTIME */
+
+bool default_stop_ok(struct device *dev)
+{
+	return false;
+}
+
+#define default_power_down_ok	NULL
+#define always_on_power_down_ok	NULL
+
+#endif /* !CONFIG_PM_RUNTIME */
+
+struct dev_power_governor simple_qos_governor = {
+	.stop_ok = default_stop_ok,
+	.power_down_ok = default_power_down_ok,
+};
+
 /**
  * pm_genpd_gov_always_on - A governor implementing an always-on policy
  */