[src/trunk]: src/sys/arch/hp700/dev Do not match on the elroy family. From Op...

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

details:   https://anonhg.NetBSD.org/src/rev/e20fbcc4fcca
branches:  trunk
changeset: 752742:e20fbcc4fcca
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Mar 05 17:47:09 2010 +0000

description:
Do not match on the elroy family. From OpenBSD.

diffstat:

 sys/arch/hp700/dev/dino.c |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 249424ee1cf0 -r e20fbcc4fcca sys/arch/hp700/dev/dino.c
--- a/sys/arch/hp700/dev/dino.c Fri Mar 05 17:04:26 2010 +0000
+++ b/sys/arch/hp700/dev/dino.c Fri Mar 05 17:47:09 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dino.c,v 1.23 2010/02/10 20:39:04 skrll Exp $ */
+/*     $NetBSD: dino.c,v 1.24 2010/03/05 17:47:09 skrll Exp $ */
 
 /*     $OpenBSD: dino.c,v 1.5 2004/02/13 20:39:31 mickey Exp $ */
 
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.23 2010/02/10 20:39:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dino.c,v 1.24 2010/03/05 17:47:09 skrll Exp $");
 
 /* #include "cardbus.h" */
 
@@ -1599,6 +1599,10 @@
            ca->ca_type.iodc_sv_model != HPPA_BRIDGE_DINO)
                return 0;
 
+       /* do not match on the elroy family */
+       if (ca->ca_type.iodc_model == 0x78)
+               return 0;
+
        /* Make sure we have an IRQ. */
        if (ca->ca_irq == HP700CF_IRQ_UNDEF)
                ca->ca_irq = hp700_intr_allocate_bit(&int_reg_cpu);