Module Name: src
Committed By: skrll
Date: Fri Mar 5 17:47:10 UTC 2010
Modified Files:
src/sys/arch/hp700/dev: dino.c
Log Message:
Do not match on the elroy family. From OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hp700/dev/dino.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/dev/dino.c
diff -u src/sys/arch/hp700/dev/dino.c:1.23 src/sys/arch/hp700/dev/dino.c:1.24
--- src/sys/arch/hp700/dev/dino.c:1.23 Wed Feb 10 20:39:04 2010
+++ src/sys/arch/hp700/dev/dino.c Fri Mar 5 17:47:09 2010
@@ -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);
