提交 c0c1633b 编写于 作者: D Dave Jones 提交者: Linus Torvalds

[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: NDave Jones <davej@redhat.com>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 278ff953
...@@ -42,10 +42,6 @@ extern void mark_free_pages(struct zone *zone); ...@@ -42,10 +42,6 @@ extern void mark_free_pages(struct zone *zone);
#ifdef CONFIG_PM #ifdef CONFIG_PM
/* kernel/power/swsusp.c */ /* kernel/power/swsusp.c */
extern int software_suspend(void); extern int software_suspend(void);
extern int pm_prepare_console(void);
extern void pm_restore_console(void);
#else #else
static inline int software_suspend(void) static inline int software_suspend(void)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册