diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-06-23 01:53:04 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-07-02 14:29:54 +0200 |
| commit | dc6e4e56e6ef473a696a1ab24f80b79b9aceb92d (patch) | |
| tree | 7ef82afc8d57b0deed436ba6f5f9483c2603d88e | |
| parent | PM / Domains: Rename struct dev_power_domain to struct dev_pm_domain (diff) | |
| download | linux-dc6e4e56e6ef473a696a1ab24f80b79b9aceb92d.tar.xz linux-dc6e4e56e6ef473a696a1ab24f80b79b9aceb92d.zip | |
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>
| -rw-r--r-- | include/linux/pm.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); |