aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/main.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c
index 56881681f18b..050a6077ea45 100644
--- a/kernel/power/main.c
+++ b/kernel/power/main.c
@@ -53,10 +53,6 @@ int pm_notifier_call_chain(unsigned long val)
53 == NOTIFY_BAD) ? -EINVAL : 0; 53 == NOTIFY_BAD) ? -EINVAL : 0;
54} 54}
55 55
56#endif /* CONFIG_PM_SLEEP */
57
58#ifdef CONFIG_SUSPEND
59
60#ifdef CONFIG_PM_DEBUG 56#ifdef CONFIG_PM_DEBUG
61int pm_test_level = TEST_NONE; 57int pm_test_level = TEST_NONE;
62 58
@@ -132,6 +128,7 @@ power_attr(pm_test);
132static inline int suspend_test(int level) { return 0; } 128static inline int suspend_test(int level) { return 0; }
133#endif /* !CONFIG_PM_DEBUG */ 129#endif /* !CONFIG_PM_DEBUG */
134 130
131#endif /* CONFIG_PM_SLEEP */
135 132
136#ifdef CONFIG_SUSPEND 133#ifdef CONFIG_SUSPEND
137 134
@@ -495,7 +492,7 @@ static struct attribute * g[] = {
495#ifdef CONFIG_PM_TRACE 492#ifdef CONFIG_PM_TRACE
496 &pm_trace_attr.attr, 493 &pm_trace_attr.attr,
497#endif 494#endif
498#ifdef CONFIG_PM_DEBUG 495#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PM_DEBUG)
499 &pm_test_attr.attr, 496 &pm_test_attr.attr,
500#endif 497#endif
501 NULL, 498 NULL,