diff options
| -rw-r--r-- | sys/arch/i386/i386/conf.c | 8 | ||||
| -rw-r--r-- | sys/arch/i386/i386/wscons_machdep.c | 4 | ||||
| -rw-r--r-- | sys/dev/wscons/wsdisplay.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/arch/i386/i386/conf.c b/sys/arch/i386/i386/conf.c index 4b39a127b2c..e2b626f5717 100644 --- a/sys/arch/i386/i386/conf.c +++ b/sys/arch/i386/i386/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.66 2001/03/05 22:16:42 millert Exp $ */ +/* $OpenBSD: conf.c,v 1.67 2001/03/14 06:18:47 millert Exp $ */ /* $NetBSD: conf.c,v 1.75 1996/05/03 19:40:20 christos Exp $ */ /* @@ -508,14 +508,14 @@ cons_decl(com); cons_decl(ws); struct consdev constab[] = { -#if NCOM + NPCCOM > 0 - cons_init(com), -#endif #if NWSDISPLAY > 0 cons_init(ws), #endif #if NPC + NVT > 0 cons_init(pc), #endif +#if NCOM + NPCCOM > 0 + cons_init(com), +#endif { 0 }, }; diff --git a/sys/arch/i386/i386/wscons_machdep.c b/sys/arch/i386/i386/wscons_machdep.c index 00f5626603e..21a9a141e0c 100644 --- a/sys/arch/i386/i386/wscons_machdep.c +++ b/sys/arch/i386/i386/wscons_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wscons_machdep.c,v 1.3 2001/03/05 22:16:42 millert Exp $ */ +/* $OpenBSD: wscons_machdep.c,v 1.4 2001/03/14 06:18:47 millert Exp $ */ /* * Copyright (c) 2001 Aaron Campbell @@ -105,7 +105,7 @@ wscnprobe(cp) } cp->cn_dev = makedev(maj, 0); - cp->cn_pri = CN_NORMAL; + cp->cn_pri = CN_INTERNAL; } void diff --git a/sys/dev/wscons/wsdisplay.c b/sys/dev/wscons/wsdisplay.c index b028225bef4..5a60303b005 100644 --- a/sys/dev/wscons/wsdisplay.c +++ b/sys/dev/wscons/wsdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wsdisplay.c,v 1.17 2001/03/14 02:49:22 mickey Exp $ */ +/* $OpenBSD: wsdisplay.c,v 1.18 2001/03/14 06:18:48 millert Exp $ */ /* $NetBSD: wsdisplay.c,v 1.37.4.1 2000/06/30 16:27:53 simonb Exp $ */ /* @@ -519,7 +519,7 @@ wsdisplay_emul_attach(parent, self, aux) wsdisplay_common_attach(sc, ap->console, ap->scrdata, ap->accessops, ap->accesscookie); - if (ap->console) { + if (ap->console && cn_tab == &wsdisplay_cons) { int maj; /* locate the major number */ |