diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2006-02-07 12:58:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-07 16:12:33 -0800 |
| commit | 46cd2f32baf181b74b16cceb123bab6fe1f61f85 (patch) | |
| tree | 6f6c7b370e4004c629bb6c6cab3f822951eb9a26 /kernel/power/console.c | |
| parent | 7b4fe29e00a5ab4e778bb24be86d836a25570bc9 (diff) | |
| download | op-kernel-dev-46cd2f32baf181b74b16cceb123bab6fe1f61f85.zip op-kernel-dev-46cd2f32baf181b74b16cceb123bab6fe1f61f85.tar.gz | |
[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.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/power/console.c b/kernel/power/console.c index 579d239..623786d 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) |
