Merge samba.org:/scratch/anton/linux-2.5

into samba.org:/scratch/anton/linux-2.5_ppc64drivers

Merge samba.org:/scratch/anton/linux-2.5
into samba.org:/scratch/anton/linux-2.5_ppc64drivers
93c79bbe · Anton Blanchard · eb0a5728 · d687c64c · 93c79bbe
Commit 93c79bbe authored May 03, 2003 by Anton Blanchard
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)
 {