Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/x86/x86/consinit.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/x86/x86/consinit.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.14
retrieving revision 1.14.6.1
diff -u -p -r1.14 -r1.14.6.1
--- src/sys/arch/x86/x86/consinit.c	2007/01/05 04:13:09	1.14
+++ src/sys/arch/x86/x86/consinit.c	2007/12/03 18:40:13	1.14.6.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: consinit.c,v 1.14 2007/01/05 04:13:09 jmcneill Exp $	*/
+/*	$NetBSD: consinit.c,v 1.14.6.1 2007/12/03 18:40:13 ad Exp $	*/
 
 /*
  * Copyright (c) 1998
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.14 2007/01/05 04:13:09 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: consinit.c,v 1.14.6.1 2007/12/03 18:40:13 ad Exp $");
 
 #include "opt_kgdb.h"
 
@@ -64,13 +64,6 @@ __KERNEL_RCSID(0, "$NetBSD: consinit.c,v
 #endif
 #include "pckbd.h" /* for pckbc_machdep_cnattach */
 
-#ifndef __x86_64__
-#include "pc.h"
-#endif
-#if (NPC > 0)
-#include <machine/pccons.h>
-#endif
-
 #ifdef __i386__
 #include "vesafb.h"
 #if (NVESAFB > 0)
@@ -169,7 +162,7 @@ consinit()
 #endif
 		consinfo = &default_consinfo;
 
-#if (NPC > 0) || (NVGA > 0) || (NEGA > 0) || (NPCDISPLAY > 0) || (NVESAFB > 0) || (NXBOXFB > 0)
+#if (NVGA > 0) || (NEGA > 0) || (NPCDISPLAY > 0) || (NVESAFB > 0) || (NXBOXFB > 0)
 	if (!strcmp(consinfo->devname, "pc")) {
 		int error;
 #if (NVESAFB > 0)
@@ -201,9 +194,6 @@ consinit()
 		if (!pcdisplay_cnattach(X86_BUS_SPACE_IO, X86_BUS_SPACE_MEM))
 			goto dokbd;
 #endif
-#if (NPC > 0)
-		pccnattach();
-#endif
 		if (0) goto dokbd; /* XXX stupid gcc */
 dokbd:
 		error = ENODEV;
@@ -242,24 +232,6 @@ dokbd:
 	panic("invalid console device %s", consinfo->devname);
 }
 
-#if (NPCKBC > 0) && (NPCKBD == 0)
-/*
- * glue code to support old console code with the
- * mi keyboard controller driver
- */
-int
-pckbport_machdep_cnattach(kbctag, kbcslot)
-	pckbport_tag_t kbctag;
-	pckbport_slot_t kbcslot;
-{
-#if (NPC > 0) && (NPCCONSKBD > 0)
-	return (pcconskbd_cnattach(kbctag, kbcslot));
-#else
-	return (ENXIO);
-#endif
-}
-#endif
-
 #ifdef KGDB
 void
 kgdb_port_init()