2006-02-02 23:45:09

by Dave Jones

[permalink] [raw]
Subject: Fix build failure in recent pm_prepare_* changes.

kernel/power/power.h:49: error: static declaration of 'pm_prepare_console' follows non-static declaration
include/linux/suspend.h:46: error: previous declaration of 'pm_prepare_console' was here
kernel/power/power.h:50: error: static declaration of 'pm_restore_console' follows non-static declaration
include/linux/suspend.h:47: error: previous declaration of 'pm_restore_console' was here

Signed-off-by: Dave Jones <[email protected]>

--- linux-2.6.15.noarch/include/linux/suspend.h~ 2006-02-02 16:27:38.000000000 -0500
+++ linux-2.6.15.noarch/include/linux/suspend.h 2006-02-02 16:28:07.000000000 -0500
@@ -42,10 +42,6 @@ extern void mark_free_pages(struct zone
#ifdef CONFIG_PM
/* kernel/power/swsusp.c */
extern int software_suspend(void);
-
-extern int pm_prepare_console(void);
-extern void pm_restore_console(void);
-
#else
static inline int software_suspend(void)
{