diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-08-11 16:38:12 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-10-16 17:27:46 -0400 |
commit | ca123102f69fb260221502ade9bbc069290fae84 (patch) | |
tree | bddbe802fcfd6b0434e26bffea76bd839fdb2666 /kernel/power | |
parent | 2a77c46de1e3dace73745015635ebbc648eca69c (diff) |
PM: Fix build issue in main.c for CONFIG_PM_SLEEP unset
Suspend statistics should depend on CONFIG_PM_SLEEP, so make that
happen.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Diffstat (limited to 'kernel/power')
-rw-r--r-- | kernel/power/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index 2757acba8e8a..a52e88425a31 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c | |||
@@ -133,8 +133,6 @@ static ssize_t pm_test_store(struct kobject *kobj, struct kobj_attribute *attr, | |||
133 | power_attr(pm_test); | 133 | power_attr(pm_test); |
134 | #endif /* CONFIG_PM_DEBUG */ | 134 | #endif /* CONFIG_PM_DEBUG */ |
135 | 135 | ||
136 | #endif /* CONFIG_PM_SLEEP */ | ||
137 | |||
138 | #ifdef CONFIG_DEBUG_FS | 136 | #ifdef CONFIG_DEBUG_FS |
139 | static char *suspend_step_name(enum suspend_stat_step step) | 137 | static char *suspend_step_name(enum suspend_stat_step step) |
140 | { | 138 | { |
@@ -230,6 +228,8 @@ static int __init pm_debugfs_init(void) | |||
230 | late_initcall(pm_debugfs_init); | 228 | late_initcall(pm_debugfs_init); |
231 | #endif /* CONFIG_DEBUG_FS */ | 229 | #endif /* CONFIG_DEBUG_FS */ |
232 | 230 | ||
231 | #endif /* CONFIG_PM_SLEEP */ | ||
232 | |||
233 | struct kobject *power_kobj; | 233 | struct kobject *power_kobj; |
234 | 234 | ||
235 | /** | 235 | /** |