From: Dave Jones <davej@redhat.com>
Date: Fri, 3 Feb 2006 11:03:44 +0000 (-0800)
Subject: [PATCH] Fix build failure in recent pm_prepare_* changes.
X-Git-Tag: v2.6.16-rc3~292
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c0c1633bdb844ec5b4ac15c97ab8927d80550c42;p=linux-2.6

[PATCH] 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 <davej@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 5dc94e777f..43bcd13eb1 100644
--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -42,10 +42,6 @@ extern void mark_free_pages(struct zone *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)
 {