[src/netbsd-1-4]: src/sys/arch/arm32/isa From trunk: 1.1 -> 1.2

[mark <mark%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b99e1619ae96
branches:  netbsd-1-4
changeset: 468047:b99e1619ae96
user:      mark <mark%NetBSD.org@localhost>
date:      Sun Apr 04 09:44:57 1999 +0000

description:
>From trunk: 1.1 -> 1.2
Update for change to isapnp_devmatch().
Fixes PR7303.

diffstat:

 sys/arch/arm32/isa/joy_isapnp.c |  9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r 1d6892afad83 -r b99e1619ae96 sys/arch/arm32/isa/joy_isapnp.c
--- a/sys/arch/arm32/isa/joy_isapnp.c   Sun Apr 04 09:28:35 1999 +0000
+++ b/sys/arch/arm32/isa/joy_isapnp.c   Sun Apr 04 09:44:57 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: joy_isapnp.c,v 1.1 1998/10/05 00:35:40 mark Exp $      */
+/*     $NetBSD: joy_isapnp.c,v 1.1.6.1 1999/04/04 09:44:57 mark Exp $  */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -63,7 +63,12 @@
        struct cfdata *match;
        void *aux;
 {
-       return isapnp_devmatch(aux, &isapnp_joy_devinfo);
+       int pri, variant;
+
+       pri = isapnp_devmatch(aux, &isapnp_joy_devinfo, &variant);
+       if (pri && variant > 0)
+               pri = 0;
+       return (pri);
 }
 
 void