From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Wed, 22 Jun 2011 23:53:04 +0000 (+0200)
Subject: PM: subsys_data in struct dev_pm_info need not depend on RM_RUNTIME
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dc6e4e56e6ef473a696a1ab24f80b79b9aceb92d;p=linux-beck.git

PM: subsys_data in struct dev_pm_info need not depend on RM_RUNTIME

The subsys_data field of struct dev_pm_info, introduced by commit
1d2b71f61b6a10216274e27b717becf9ae101fc7 (PM / Runtime: Add subsystem
data field to struct dev_pm_info), is going to be used even if
CONFIG_PM_RUNTIME is not set, so move it from under the #ifdef.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---

diff --git a/include/linux/pm.h b/include/linux/pm.h
index e3963208aa93..7e8f0763d1ec 100644
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
@@ -461,8 +461,8 @@ struct dev_pm_info {
 	unsigned long		active_jiffies;
 	unsigned long		suspended_jiffies;
 	unsigned long		accounting_timestamp;
-	void			*subsys_data;  /* Owned by the subsystem. */
 #endif
+	void			*subsys_data;  /* Owned by the subsystem. */
 };
 
 extern void update_pm_runtime_accounting(struct device *dev);