diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2001-03-14 06:18:49 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2001-03-14 06:18:49 +0000 |
| commit | 4f84f4d31232004b002699c4918bd5dfede599f9 (patch) | |
| tree | 033052dcd01a42c249152f22e612d44356a67679 /sys/dev | |
| parent | 9ad1dacc2086f200c905ea3ae404b97a1cc64576 (diff) | |
Back out order change in conf.c and priority change in wscons_machdep.c
Add kludge to prevent wscons on i386 from stealing the console from
another source. wscons should really be fixed to not touch cn_tab...
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/wscons/wsdisplay.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 */ |