Remove __HAVE_NWSCONS and related remnants of pre-wscons days; no functional

change.

2 files changed, 2 insertions, 20 deletions

diff --git a/sys/dev/ic/pckbc.c b/sys/dev/ic/pckbc.c
index 22714f4155f..60fab5c4b94 100644
--- a/sys/dev/ic/pckbc.c
+++ b/sys/dev/ic/pckbc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbc.c,v 1.8 2004/04/02 04:39:50 deraadt Exp $ */
+/* $OpenBSD: pckbc.c,v 1.9 2004/11/02 21:21:00 miod Exp $ */
 /* $NetBSD: pckbc.c,v 1.5 2000/06/09 04:58:35 soda Exp $ */
 
 /*
@@ -42,11 +42,7 @@
 #include <dev/ic/i8042reg.h>
 #include <dev/ic/pckbcvar.h>
 
-#ifdef __HAVE_NWSCONS /* XXX: this port uses sys/dev/pckbc */
 #include "pckbd.h"
-#else /* ie: only md drivers attach to pckbc */
-#define NPCKBD 0
-#endif
 
 #if (NPCKBD > 0)
 #include <dev/pckbc/pckbdvar.h>
@@ -977,18 +973,7 @@ pckbc_cnattach(iot, addr, cmd_offset, slot)
 #if (NPCKBD > 0)
 		res = pckbd_cnattach(&pckbc_consdata, slot);
 #else
-		/*
-		 * XXX This should be replaced with the `notyet' case
-		 * XXX when all of the old PC-style console drivers
-		 * XXX have gone away.  When that happens, all of
-		 * XXX the pckbc_machdep_cnattach() should be purged,
-		 * XXX as well.
-		 */
-#ifdef notyet
 		res = ENXIO;
-#else
-		res = pckbc_machdep_cnattach(&pckbc_consdata, slot);
-#endif
 #endif /* NPCKBD > 0 */
 	}
 
diff --git a/sys/dev/ic/pckbcvar.h b/sys/dev/ic/pckbcvar.h
index 3acca691018..321cb8aa375 100644
--- a/sys/dev/ic/pckbcvar.h
+++ b/sys/dev/ic/pckbcvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pckbcvar.h,v 1.3 2004/04/02 04:39:50 deraadt Exp $ */
+/* $OpenBSD: pckbcvar.h,v 1.4 2004/11/02 21:21:00 miod Exp $ */
 /* $NetBSD: pckbcvar.h,v 1.4 2000/06/09 04:58:35 soda Exp $ */
 
 /*
@@ -106,7 +106,4 @@ int pckbc_cnattach(bus_space_tag_t, bus_addr_t, bus_size_t,
 int pckbc_is_console(bus_space_tag_t, bus_addr_t);
 int pckbcintr(void *);
 
-/* md hook for use without mi wscons */
-int pckbc_machdep_cnattach(pckbc_tag_t, pckbc_slot_t);
-
 #endif /* _DEV_IC_PCKBCVAR_H_ */