summaryrefslogtreecommitdiff
path: root/sys/arch/sparc/dev
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2003-01-22 18:59:37 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2003-01-22 18:59:37 +0000
commite07920d33473fd0e54b5d4c03a1d16f558838b50 (patch)
tree13ef65b8c72ce73da027c41504d586700f3a115f /sys/arch/sparc/dev
parenta8f93a88a8a119d94c225817ad5706c7c9604837 (diff)
Revert previous - it would prevent the second zs chip from being probed
on the Voyager, thus preventing keyboard support from working at all.
Diffstat (limited to 'sys/arch/sparc/dev')
-rw-r--r--sys/arch/sparc/dev/zs.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/arch/sparc/dev/zs.c b/sys/arch/sparc/dev/zs.c
index 8deba289a7e..bef5714a649 100644
--- a/sys/arch/sparc/dev/zs.c
+++ b/sys/arch/sparc/dev/zs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: zs.c,v 1.38 2003/01/20 15:57:28 miod Exp $ */
+/* $OpenBSD: zs.c,v 1.39 2003/01/22 18:59:36 miod Exp $ */
/* $NetBSD: zs.c,v 1.50 1997/10/18 00:00:40 gwr Exp $ */
/*-
@@ -226,13 +226,8 @@ zs_match(parent, vcf, aux)
if (strcmp(cf->cf_driver->cd_name, ra->ra_name))
return (0);
if ((ca->ca_bustype == BUS_MAIN && !CPU_ISSUN4) ||
- (ca->ca_bustype == BUS_OBIO && CPU_ISSUN4M)) {
- if (getpropint(ra->ra_node, "slave", -2) == cf->cf_unit &&
- findzs(cf->cf_unit))
- return (1);
- return (0);
- }
-
+ (ca->ca_bustype == BUS_OBIO && CPU_ISSUN4M))
+ return (getpropint(ra->ra_node, "slave", -2) == cf->cf_unit);
ra->ra_len = NBPG;
return (probeget(ra->ra_vaddr, 1) != -1);
}