summaryrefslogtreecommitdiffstats
path: root/kernel/power/console.c
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2006-02-07 21:58:50 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-08 01:12:33 +0100
commit46cd2f32baf181b74b16cceb123bab6fe1f61f85 (patch)
tree6f6c7b370e4004c629bb6c6cab3f822951eb9a26 /kernel/power/console.c
parent[PATCH] More informative message on umount failure (diff)
downloadlinux-46cd2f32baf181b74b16cceb123bab6fe1f61f85.tar.xz
linux-46cd2f32baf181b74b16cceb123bab6fe1f61f85.zip
[PATCH] Fix build failure in recent pm_prepare_* changes.
Fix compilation problem in PM headers. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/power/console.c')
-rw-r--r--kernel/power/console.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/power/console.c b/kernel/power/console.c
index 579d239d129f..623786d44159 100644
--- a/kernel/power/console.c
+++ b/kernel/power/console.c
@@ -9,7 +9,9 @@
#include <linux/console.h>
#include "power.h"
-#ifdef SUSPEND_CONSOLE
+#if defined(CONFIG_VT) && defined(CONFIG_VT_CONSOLE)
+#define SUSPEND_CONSOLE (MAX_NR_CONSOLES-1)
+
static int orig_fgconsole, orig_kmsg;
int pm_prepare_console(void)