Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/i386/isa/ahc_isa.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/i386/isa/ahc_isa.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -p -r1.23.2.1 -r1.23.2.2
--- src/sys/arch/i386/isa/ahc_isa.c	2004/08/03 10:36:05	1.23.2.1
+++ src/sys/arch/i386/isa/ahc_isa.c	2004/09/18 14:35:40	1.23.2.2
@@ -1,4 +1,4 @@
-/*	$NetBSD: ahc_isa.c,v 1.23.2.1 2004/08/03 10:36:05 skrll Exp $	*/
+/*	$NetBSD: ahc_isa.c,v 1.23.2.2 2004/09/18 14:35:40 skrll Exp $	*/
 
 /*
  * Product specific probe and attach routines for:
@@ -117,7 +117,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v 1.23.2.1 2004/08/03 10:36:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahc_isa.c,v 1.23.2.2 2004/09/18 14:35:40 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -288,7 +288,7 @@ ahc_isa_match(ia, iobase)
 	if (irq < 0)
 		return (0);
 
-	if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT &&
+	if (ia->ia_irq[0].ir_irq != ISA_UNKNOWN_IRQ &&
 	    ia->ia_irq[0].ir_irq != irq) {
 		printf("ahc_isa_match: irq mismatch (kernel %d, card %d)\n",
 		    ia->ia_irq[0].ir_irq, irq);
@@ -336,7 +336,7 @@ ahc_isa_probe(parent, match, aux)
 	if (ISA_DIRECT_CONFIG(ia))
 		return (0);
 
-	if (ia->ia_io[0].ir_addr != ISACF_PORT_DEFAULT)
+	if (ia->ia_io[0].ir_addr != ISA_UNKNOWN_PORT)
 		return (ahc_isa_match(ia, ia->ia_io[0].ir_addr));
 
 	/*