aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2006-02-03 03:03:44 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-03 08:32:00 -0800
commitc0c1633bdb844ec5b4ac15c97ab8927d80550c42 (patch)
tree8f70444139c8564c0f1e88e1f33adda036ae6a96 /include
parent278ff9537030bbb292b33504f5e1f6e0126793eb (diff)
[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>
Diffstat (limited to 'include')
-rw-r--r--include/linux/suspend.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/suspend.h b/include/linux/suspend.h
index 5dc94e777fa..43bcd13eb1e 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)
{