Browse Source

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>
Rafael J. Wysocki 17 years ago
parent
commit
7671b8ae53
1 changed files with 2 additions and 5 deletions
  1. 2 5
      kernel/power/main.c

+ 2 - 5
kernel/power/main.c

@@ -53,10 +53,6 @@ int pm_notifier_call_chain(unsigned long val)
 			== NOTIFY_BAD) ? -EINVAL : 0;
 			== NOTIFY_BAD) ? -EINVAL : 0;
 }
 }
 
 
-#endif /* CONFIG_PM_SLEEP */
-
-#ifdef CONFIG_SUSPEND
-
 #ifdef CONFIG_PM_DEBUG
 #ifdef CONFIG_PM_DEBUG
 int pm_test_level = TEST_NONE;
 int pm_test_level = TEST_NONE;
 
 
@@ -132,6 +128,7 @@ power_attr(pm_test);
 static inline int suspend_test(int level) { return 0; }
 static inline int suspend_test(int level) { return 0; }
 #endif /* !CONFIG_PM_DEBUG */
 #endif /* !CONFIG_PM_DEBUG */
 
 
+#endif /* CONFIG_PM_SLEEP */
 
 
 #ifdef CONFIG_SUSPEND
 #ifdef CONFIG_SUSPEND
 
 
@@ -495,7 +492,7 @@ static struct attribute * g[] = {
 #ifdef CONFIG_PM_TRACE
 #ifdef CONFIG_PM_TRACE
 	&pm_trace_attr.attr,
 	&pm_trace_attr.attr,
 #endif
 #endif
-#ifdef CONFIG_PM_DEBUG
+#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PM_DEBUG)
 	&pm_test_attr.attr,
 	&pm_test_attr.attr,
 #endif
 #endif
 	NULL,
 	NULL,