From 22a83e6d654070d7238cdd28dcc2518b9963fabe Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Fri, 14 Dec 2007 01:07:13 +0100
Subject: [PATCH] --- yaml --- r: 82387 b: refs/heads/master c:
 7671b8ae5381a504d4c4ef8dd9c47128c2c3fd7e h: refs/heads/master i:   82385:
 64c54ead2dfaf9061c4f79b9fb4bcec3cbdf2db1   82383:
 20f0ae38ae6dd507d2d4e96667f07b93ac96b7a4 v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/power/main.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 00b367173f0e..a2a28daaa0a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3627f67b1d5ddd8f65eedc2a76da90fbe062530
+refs/heads/master: 7671b8ae5381a504d4c4ef8dd9c47128c2c3fd7e
diff --git a/trunk/kernel/power/main.c b/trunk/kernel/power/main.c
index 56881681f18b..050a6077ea45 100644
--- a/trunk/kernel/power/main.c
+++ b/trunk/kernel/power/main.c
@@ -53,10 +53,6 @@ int pm_notifier_call_chain(unsigned long val)
 			== NOTIFY_BAD) ? -EINVAL : 0;
 }
 
-#endif /* CONFIG_PM_SLEEP */
-
-#ifdef CONFIG_SUSPEND
-
 #ifdef CONFIG_PM_DEBUG
 int pm_test_level = TEST_NONE;
 
@@ -132,6 +128,7 @@ power_attr(pm_test);
 static inline int suspend_test(int level) { return 0; }
 #endif /* !CONFIG_PM_DEBUG */
 
+#endif /* CONFIG_PM_SLEEP */
 
 #ifdef CONFIG_SUSPEND
 
@@ -495,7 +492,7 @@ static struct attribute * g[] = {
 #ifdef CONFIG_PM_TRACE
 	&pm_trace_attr.attr,
 #endif
-#ifdef CONFIG_PM_DEBUG
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PM_DEBUG)
 	&pm_test_attr.attr,
 #endif
 	NULL,