diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c
index 37ba0a781f5b..751f8622bd45 100644
--- a/sys/arch/i386/i386/conf.c
+++ b/sys/arch/i386/i386/conf.c
@@ -1 +1 @@
-revision 1.8 intentionally removed
+revision 1.9 intentionally removed
diff --git a/sys/arch/i386/i386/cons.c b/sys/arch/i386/i386/cons.c
index 64d20e5d7f25..e8f9b510f0dd 100644
--- a/sys/arch/i386/i386/cons.c
+++ b/sys/arch/i386/i386/cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.5 1993/05/22 11:41:13 cgd Exp $
+ *	$Id: cons.c,v 1.6 1993/05/28 09:10:31 deraadt Exp $
  */
 
 
@@ -53,14 +53,19 @@
 #include "cons.h"
 
 /* XXX - all this could be autoconfig()ed */
+#include "pc.h"
+#if NPC > 0
 int pccnprobe(), pccninit(), pccngetc(), pccnputc();
+#endif
 #include "com.h"
 #if NCOM > 0
 int comcnprobe(), comcninit(), comcngetc(), comcnputc();
 #endif
 
 struct	consdev constab[] = {
+#if NPC > 0
 	{ pccnprobe,	pccninit,	pccngetc,	pccnputc },
+#endif
 #if NCOM > 0
 	{ comcnprobe,	comcninit,	comcngetc,	comcnputc },
 #endif
@@ -72,6 +77,10 @@ struct	tty *constty = 0;	/* virtual console output device */
 struct	consdev *cn_tab;	/* physical console device info */
 struct	tty *cn_tty;		/* XXX: console tty struct for tprintf */
 
+consinit()
+{
+}
+
 cninit()
 {
 	register struct consdev *cp;
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c
index 89794d6bfe71..c2486f96c43a 100644
--- a/sys/arch/i386/i386/machdep.c
+++ b/sys/arch/i386/i386/machdep.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
- *	$Id: machdep.c,v 1.19 1993/05/27 16:44:20 cgd Exp $
+ *	$Id: machdep.c,v 1.20 1993/05/28 09:10:33 deraadt Exp $
  */
 
 #include "param.h"
@@ -548,7 +548,7 @@ boot(arghowto)
 	splhigh();
 	devtype = major(rootdev);
 	if (howto&RB_HALT) {
-		printf("\nThe operating system has halted. Please press any key to reboot.\n\n> ");
+		printf("\nThe operating system has halted. Please press any key to reboot.\n\n");
 		cngetc();
 	} else {
 		if (howto & RB_DUMP) {
@@ -1001,7 +1001,7 @@ init386(first)
 		 * If they get working well enough to recompile, they can unset
 		 * the flag; otherwise, it's a toy and they have to lump it.
 		 */
-		getchar();	/* kernel getchar in /sys/i386/isa/pccons.c*/
+		cngetc();
 #endif	/* !INFORM_WAIT*/
 	}
 	/*
diff --git a/sys/dev/cons.c b/sys/dev/cons.c
index 64d20e5d7f25..e8f9b510f0dd 100644
--- a/sys/dev/cons.c
+++ b/sys/dev/cons.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)cons.c	7.2 (Berkeley) 5/9/91
- *	$Id: cons.c,v 1.5 1993/05/22 11:41:13 cgd Exp $
+ *	$Id: cons.c,v 1.6 1993/05/28 09:10:31 deraadt Exp $
  */
 
 
@@ -53,14 +53,19 @@
 #include "cons.h"
 
 /* XXX - all this could be autoconfig()ed */
+#include "pc.h"
+#if NPC > 0
 int pccnprobe(), pccninit(), pccngetc(), pccnputc();
+#endif
 #include "com.h"
 #if NCOM > 0
 int comcnprobe(), comcninit(), comcngetc(), comcnputc();
 #endif
 
 struct	consdev constab[] = {
+#if NPC > 0
 	{ pccnprobe,	pccninit,	pccngetc,	pccnputc },
+#endif
 #if NCOM > 0
 	{ comcnprobe,	comcninit,	comcngetc,	comcnputc },
 #endif
@@ -72,6 +77,10 @@ struct	tty *constty = 0;	/* virtual console output device */
 struct	consdev *cn_tab;	/* physical console device info */
 struct	tty *cn_tty;		/* XXX: console tty struct for tprintf */
 
+consinit()
+{
+}
+
 cninit()
 {
 	register struct consdev *cp;