PM: subsys_data in struct dev_pm_info need not depend on RM_RUNTIME
Rafael J. Wysocki [Wed, 22 Jun 2011 23:53:04 +0000 (01:53 +0200)]
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>

include/linux/pm.h

index e396320..7e8f076 100644 (file)
@@ -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);