summaryrefslogtreecommitdiff
path: root/sys/arch/sparc64
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2004-11-02 21:21:01 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2004-11-02 21:21:01 +0000
commit3433b53ca82bfb8f195c38e10231a7b9f79dcb1d (patch)
treedc8538c399520f57a987d66ac8441217ee1aa66c /sys/arch/sparc64
parent821760dcdd9e6dbddf38ea1c241ef0106ccde643 (diff)
Remove __HAVE_NWSCONS and related remnants of pre-wscons days; no functional
change.
Diffstat (limited to 'sys/arch/sparc64')
-rw-r--r--sys/arch/sparc64/include/types.h3
-rw-r--r--sys/arch/sparc64/sparc64/machdep.c17
2 files changed, 2 insertions, 18 deletions
diff --git a/sys/arch/sparc64/include/types.h b/sys/arch/sparc64/include/types.h
index f89b648b667..cfb53ca1831 100644
--- a/sys/arch/sparc64/include/types.h
+++ b/sys/arch/sparc64/include/types.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: types.h,v 1.7 2004/06/28 01:47:41 aaron Exp $ */
+/* $OpenBSD: types.h,v 1.8 2004/11/02 21:20:59 miod Exp $ */
/* $NetBSD: types.h,v 1.17 2001/05/12 22:42:07 kleink Exp $ */
/*
@@ -65,7 +65,6 @@ typedef unsigned long int paddr_t;
typedef paddr_t psize_t;
#endif
-#define __HAVE_NWSCONS
#define __HAVE_DEVICE_REGISTER
#define __HAVE_GENERIC_SOFT_INTERRUPTS
#define __HAVE_EVCOUNT
diff --git a/sys/arch/sparc64/sparc64/machdep.c b/sys/arch/sparc64/sparc64/machdep.c
index 74b73f9c4ea..5e1a341b10c 100644
--- a/sys/arch/sparc64/sparc64/machdep.c
+++ b/sys/arch/sparc64/sparc64/machdep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: machdep.c,v 1.73 2004/10/01 18:18:49 jason Exp $ */
+/* $OpenBSD: machdep.c,v 1.74 2004/11/02 21:20:59 miod Exp $ */
/* $NetBSD: machdep.c,v 1.108 2001/07/24 19:30:14 eeh Exp $ */
/*-
@@ -224,21 +224,6 @@ caddr_t allocsys(caddr_t);
void dumpsys(void);
void stackdump(void);
-#if (NPCKBC > 0) && (NPCKBD == 0)
-/*
- * This is called by the pckbc driver if no pckbd is configured.
- * On the i386, it is used to glue in the old, deprecated console
- * code. On the sparc64, it does nothing.
- */
-int
-pckbc_machdep_cnattach(kbctag, kbcslot)
- pckbc_tag_t kbctag;
- pckbc_slot_t kbcslot;
-{
- return (ENXIO);
-}
-#endif
-
/*
* Machine-dependent startup code
*/