tree 8f70444139c8564c0f1e88e1f33adda036ae6a96
parent 278ff9537030bbb292b33504f5e1f6e0126793eb
author Dave Jones <davej@redhat.com> 1138964624 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1138984320 -0800

[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>