diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-12-13 19:07:13 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-02-01 18:30:56 -0500 |
commit | 7671b8ae5381a504d4c4ef8dd9c47128c2c3fd7e (patch) | |
tree | f6b8c2ba01ce566549b948eb0cd7f713cf824a41 | |
parent | a3627f67b1d5ddd8f65eedc2a76da90fbe062530 (diff) |
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.c | 7 |
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 |
61 | int pm_test_level = TEST_NONE; | 57 | int pm_test_level = TEST_NONE; |
62 | 58 | ||
@@ -132,6 +128,7 @@ power_attr(pm_test); | |||
132 | static inline int suspend_test(int level) { return 0; } | 128 | static 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, |