Merge http://ppc.bkbits.net/for-linus-ppc64drivers

into home.transmeta.com:/home/torvalds/v2.5/linux

Merge http://ppc.bkbits.net/for-linus-ppc64drivers
into home.transmeta.com:/home/torvalds/v2.5/linux
d210257e · Linus Torvalds · 1d812048 · 869e333a · d210257e
Commit d210257e authored May 04, 2003 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

drivers/char/hvc_console.c drivers/char/hvc_console.c +5 -0

No files found.
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -227,7 +227,12 @@ static void hvc_poll(int index)
 	spin_unlock_irqrestore(&hp->lock, flags);
 }
+#if defined (CONFIG_XMON)
 extern unsigned long cpus_in_xmon;
+#else
+unsigned long cpus_in_xmon=0;
+#endif
 int khvcd(void *unused)
 {