Skip to content

Commit

Permalink
[PATCH] Fix build failure in recent pm_prepare_* changes.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dave Jones authored and Linus Torvalds committed Feb 3, 2006
1 parent 278ff95 commit c0c1633
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions include/linux/suspend.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit c0c1633

Please sign in to comment.