summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2006-08-06 11:36:36 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2006-08-06 11:36:36 +0000
commit60ab049df7ab2fb1db97c9ba2cce73c5e42b5817 (patch)
tree7c9abb7a027ee3d88b28a95e5faed73f57a65486 /sys
parent6fac26f7191861d2208bf279d1cdfd26bb31c03f (diff)
Do not try and mate wskbd0 and wsdisplay0 if there is now wsdisplay in the
kernel; spotted by kettenis.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/wscons/wskbd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/wscons/wskbd.c b/sys/dev/wscons/wskbd.c
index 8044fa78a67..304db699084 100644
--- a/sys/dev/wscons/wskbd.c
+++ b/sys/dev/wscons/wskbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wskbd.c,v 1.50 2006/08/05 16:59:57 miod Exp $ */
+/* $OpenBSD: wskbd.c,v 1.51 2006/08/06 11:36:35 miod Exp $ */
/* $NetBSD: wskbd.c,v 1.80 2005/05/04 01:52:16 augustss Exp $ */
/*
@@ -432,7 +432,7 @@ wskbd_attach(struct device *parent, struct device *self, void *aux)
}
#endif
-#if NWSMUX == 0
+#if WSDISPLAY > 0 && NWSMUX == 0
if (ap->console == 0) {
/*
* In the non-wsmux world, always connect wskbd0 and wsdisplay0