summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/amd64/isa/isa.c5
-rw-r--r--sys/i386/isa/isa.c5
2 files changed, 2 insertions, 8 deletions
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c
index 5ee9c6c..90dd24d 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.28 1994/10/17 21:16:38 phk Exp $
+ * $Id: isa.c,v 1.30 1994/10/19 01:59:06 wollman Exp $
*/
/*
@@ -382,9 +382,6 @@ config_isadev_c(isdp, mp, reconfig)
struct isa_driver *dp = isdp->id_driver;
checkbits = 0;
-#ifndef ALLOW_CONFLICT_IRQ
- checkbits |= CC_IRQ;
-#endif
#ifndef ALLOW_CONFLICT_DRQ
checkbits |= CC_DRQ;
#endif
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 5ee9c6c..90dd24d 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.28 1994/10/17 21:16:38 phk Exp $
+ * $Id: isa.c,v 1.30 1994/10/19 01:59:06 wollman Exp $
*/
/*
@@ -382,9 +382,6 @@ config_isadev_c(isdp, mp, reconfig)
struct isa_driver *dp = isdp->id_driver;
checkbits = 0;
-#ifndef ALLOW_CONFLICT_IRQ
- checkbits |= CC_IRQ;
-#endif
#ifndef ALLOW_CONFLICT_DRQ
checkbits |= CC_DRQ;
#endif
OpenPOWER on IntegriCloud