summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2007-12-14 01:07:13 +0100
committerLen Brown <len.brown@intel.com>2008-02-02 00:30:56 +0100
commit7671b8ae5381a504d4c4ef8dd9c47128c2c3fd7e (patch)
treef6b8c2ba01ce566549b948eb0cd7f713cf824a41
parentACPI: clear GPE earily in resume to avoid warning (diff)
downloadlinux-7671b8ae5381a504d4c4ef8dd9c47128c2c3fd7e.tar.xz
linux-7671b8ae5381a504d4c4ef8dd9c47128c2c3fd7e.zip
suspend: fix ia64 allmodconfig build
kernel/power/main.c:488: error: ‘pm_test_attr’ undeclared here (not in a function) Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com>
-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)
== 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,