aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2006-02-07 12:58:50 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-07 16:12:33 -0800
commit46cd2f32baf181b74b16cceb123bab6fe1f61f85 (patch)
tree6f6c7b370e4004c629bb6c6cab3f822951eb9a26 /include/linux
parent7b4fe29e00a5ab4e778bb24be86d836a25570bc9 (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.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 43bcd13eb1e..37c1c76fd54 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -42,13 +42,21 @@ extern void mark_free_pages(struct zone *zone);
#ifdef CONFIG_PM
/* kernel/power/swsusp.c */
extern int software_suspend(void);
+
+#if defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE)
+extern int pm_prepare_console(void);
+extern void pm_restore_console(void);
+#else
+static inline int pm_prepare_console(void) { return 0; }
+static inline void pm_restore_console(void) {}
+#endif /* defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE) */
#else
static inline int software_suspend(void)
{
printk("Warning: fake suspend called\n");
return -EPERM;
}
-#endif
+#endif /* CONFIG_PM */
#ifdef CONFIG_SUSPEND_SMP
extern void disable_nonboot_cpus(void);