diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2006-02-07 15:58:50 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 19:12:33 -0500 |
commit | 46cd2f32baf181b74b16cceb123bab6fe1f61f85 (patch) | |
tree | 6f6c7b370e4004c629bb6c6cab3f822951eb9a26 /include/linux | |
parent | 7b4fe29e00a5ab4e778bb24be86d836a25570bc9 (diff) |
[PATCH] Fix build failure in recent pm_prepare_* changes.
Fix compilation problem in PM headers.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/suspend.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h index 43bcd13eb1ec..37c1c76fd547 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h | |||
@@ -42,13 +42,21 @@ extern void mark_free_pages(struct zone *zone); | |||
42 | #ifdef CONFIG_PM | 42 | #ifdef CONFIG_PM |
43 | /* kernel/power/swsusp.c */ | 43 | /* kernel/power/swsusp.c */ |
44 | extern int software_suspend(void); | 44 | extern int software_suspend(void); |
45 | |||
46 | #if defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE) | ||
47 | extern int pm_prepare_console(void); | ||
48 | extern void pm_restore_console(void); | ||
49 | #else | ||
50 | static inline int pm_prepare_console(void) { return 0; } | ||
51 | static inline void pm_restore_console(void) {} | ||
52 | #endif /* defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE) */ | ||
45 | #else | 53 | #else |
46 | static inline int software_suspend(void) | 54 | static inline int software_suspend(void) |
47 | { | 55 | { |
48 | printk("Warning: fake suspend called\n"); | 56 | printk("Warning: fake suspend called\n"); |
49 | return -EPERM; | 57 | return -EPERM; |
50 | } | 58 | } |
51 | #endif | 59 | #endif /* CONFIG_PM */ |
52 | 60 | ||
53 | #ifdef CONFIG_SUSPEND_SMP | 61 | #ifdef CONFIG_SUSPEND_SMP |
54 | extern void disable_nonboot_cpus(void); | 62 | extern void disable_nonboot_cpus(void); |