www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit

author	Dave Jones <davej@redhat.com>
	Fri, 3 Feb 2006 11:03:44 +0000 (03:03 -0800)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Fri, 3 Feb 2006 16:32:00 +0000 (08:32 -0800)
commit	c0c1633bdb844ec5b4ac15c97ab8927d80550c42
tree	8f70444139c8564c0f1e88e1f33adda036ae6a96	tree \| snapshot
parent	278ff9537030bbb292b33504f5e1f6e0126793eb	commit \| 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>