From 3beb60fbe1ade27e7b414e3e6003bf300cf20c36 Mon Sep 17 00:00:00 2001
From: Magnus Damm <damm@opensource.se>
Date: Sat, 25 Feb 2012 22:14:18 +0100
Subject: [PATCH] --- yaml --- r: 291871 b: refs/heads/master c:
 b642631d38c28fefd1232a6b96713eb54b60130d h: refs/heads/master i:   291869:
 096385d0ca59b1fa754abbf38c6c6a7bce29bd89   291867:
 79dc3a37392760e688dab8bbb1607ea883444939   291863:
 48037c7d4ab966e9234f40d8746f501a1a8e9b92   291855:
 bdd7a0103bbd61bdff00587f2b12c6798efdd931   291839:
 78f3b13581fbbb2fb5b84a1bd8d36e9ee2a8cea2 v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/pm_domain.h | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b9dd357a3a8d..fe067317a163 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b4f617b1c2004332113b4a2c89dfb6e8029c987
+refs/heads/master: b642631d38c28fefd1232a6b96713eb54b60130d
diff --git a/trunk/include/linux/pm_domain.h b/trunk/include/linux/pm_domain.h
index e76cc9ae8233..5c2bbc248c11 100644
--- a/trunk/include/linux/pm_domain.h
+++ b/trunk/include/linux/pm_domain.h
@@ -155,6 +155,10 @@ extern bool default_stop_ok(struct device *dev);
 extern struct dev_power_governor pm_domain_always_on_gov;
 #else
 
+static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev)
+{
+	return ERR_PTR(-ENOSYS);
+}
 static inline struct generic_pm_domain *dev_to_genpd(struct device *dev)
 {
 	return ERR_PTR(-ENOSYS);
@@ -195,7 +199,8 @@ static inline int __pm_genpd_remove_callbacks(struct device *dev, bool clear_td)
 {
 	return -ENOSYS;
 }
-static inline void pm_genpd_init(struct generic_pm_domain *genpd, bool is_off)
+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)
@@ -206,11 +211,8 @@ static inline bool default_stop_ok(struct device *dev)
 {
 	return false;
 }
+#define simple_qos_governor NULL
 #define pm_domain_always_on_gov NULL
-static inline struct generic_pm_domain_data *dev_gpd_data(struct device *dev)
-{
-	return NULL;
-}
 #endif
 
 static inline int pm_genpd_remove_callbacks(struct device *dev)