From c25cfd0b0dfc4670fa3c676ea64f5ca46fd402c4 Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Sat, 13 May 1995 00:09:38 +0000
Subject: [PATCH] "1 easy fix in 10 excrutiating steps"

A phone call from Manfred quickly pointed up the fact that I got the conflict
check backwards.  NOW we implement the conflict checking correctly!  Wheesh!
---
 sys/amd64/isa/isa.c | 4 ++--
 sys/i386/isa/isa.c  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index 152cae8c33a9..c4a2455b8d6e 100644
--- a/sys/amd64/isa/isa.c
+++ b/sys/amd64/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.47 1995/05/11 02:15:52 jkh Exp $
+ *	$Id: isa.c,v 1.48 1995/05/11 05:20:43 jkh Exp $
  */
 
 /*
@@ -174,7 +174,7 @@ haveseen(dvp, tmpdvp, checkbits)
 	 * Only check against devices that have already been found and are not
 	 * unilaterally allowed to conflict anyway.
 	 */
-	if (tmpdvp->id_alive && !tmpdvp->id_conflicts) {
+	if (tmpdvp->id_alive && !dvp->id_conflicts) {
 		char const *whatnot;
 
 		whatnot = checkbits & CC_ATTACH ? "attach" : "prob";
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 152cae8c33a9..c4a2455b8d6e 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.47 1995/05/11 02:15:52 jkh Exp $
+ *	$Id: isa.c,v 1.48 1995/05/11 05:20:43 jkh Exp $
  */
 
 /*
@@ -174,7 +174,7 @@ haveseen(dvp, tmpdvp, checkbits)
 	 * Only check against devices that have already been found and are not
 	 * unilaterally allowed to conflict anyway.
 	 */
-	if (tmpdvp->id_alive && !tmpdvp->id_conflicts) {
+	if (tmpdvp->id_alive && !dvp->id_conflicts) {
 		char const *whatnot;
 
 		whatnot = checkbits & CC_ATTACH ? "attach" : "prob";