diff options
author | 2013-07-27 19:45:01 +0000 | |
---|---|---|
committer | 2013-07-27 19:45:01 +0000 | |
commit | 94969b708dcf04ee8ac028bbcd0d3fd0f8e9dc59 (patch) | |
tree | 3ce0c05a640f74e81a592a9185de2568cfdff3a7 /sys/arch/sparc | |
parent | Minimalist update for 5.4. eyeballed deraadt@ (diff) | |
download | wireguard-openbsd-94969b708dcf04ee8ac028bbcd0d3fd0f8e9dc59.tar.xz wireguard-openbsd-94969b708dcf04ee8ac028bbcd0d3fd0f8e9dc59.zip |
Revert wrong chunk introduced in 1.50, causing console keyboards not to attach
as console; fixes non-wsmux kernels such as bsd.rd; noticed by sebastia@
Diffstat (limited to 'sys/arch/sparc')
-rw-r--r-- | sys/arch/sparc/dev/zs.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/arch/sparc/dev/zs.c b/sys/arch/sparc/dev/zs.c index 34f52252f84..07cce7548df 100644 --- a/sys/arch/sparc/dev/zs.c +++ b/sys/arch/sparc/dev/zs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: zs.c,v 1.50 2013/04/21 14:44:16 sebastia Exp $ */ +/* $OpenBSD: zs.c,v 1.51 2013/07/27 19:45:01 miod Exp $ */ /* $NetBSD: zs.c,v 1.50 1997/10/18 00:00:40 gwr Exp $ */ /*- @@ -1155,11 +1155,7 @@ setup_console: return; } zs_conschan = zc; - /* hardcoded: console is only on unit 0, - * unit 1 is keyboard/mouse, see zs_attach - */ - if (zs_unit == 0) - zs_hwflags[zs_unit][channel] = ZS_HWFLAG_CONSOLE; + zs_hwflags[zs_unit][channel] = ZS_HWFLAG_CONSOLE; /* switch to selected console */ cn_tab = console; (*cn_tab->cn_probe)(cn_tab); |