summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1997-07-10 10:22:34 +0000
committerkato <kato@FreeBSD.org>1997-07-10 10:22:34 +0000
commit0b4e905ca91ef3d8d160b505f90e6e56ad41654f (patch)
tree1bf32cfb2ed8461ea93102df321078503fd84ec1
parentd5d11f5dbbf87531ba2bba4ab853a0a492d0da80 (diff)
downloadFreeBSD-src-0b4e905ca91ef3d8d160b505f90e6e56ad41654f.zip
FreeBSD-src-0b4e905ca91ef3d8d160b505f90e6e56ad41654f.tar.gz
Synchronize with sys/i386/isa/isa.c revision 1.94.
-rw-r--r--sys/pc98/pc98/pc98.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/pc98/pc98/pc98.c b/sys/pc98/pc98/pc98.c
index 9e36705..18abf583 100644
--- a/sys/pc98/pc98/pc98.c
+++ b/sys/pc98/pc98/pc98.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)isa.c 7.2 (Berkeley) 5/13/91
- * $Id: pc98.c,v 1.31 1997/06/09 13:40:34 kato Exp $
+ * $Id: pc98.c,v 1.32 1997/06/26 14:49:25 kato Exp $
*/
/*
@@ -560,14 +560,9 @@ config_isadev_c(isdp, mp, reconfig)
undirect_isa_irq(rirq); /* free for ISA */
}
#endif /* APIC_IO */
- if (!isdp->id_conflicts
- || (!intr_registered(ffs(isdp->id_irq) - 1)
- && isdp->id_intr != NULL))
- register_intr(ffs(isdp->id_irq) - 1,
- isdp->id_id,
- isdp->id_ri_flags,
- isdp->id_intr,
- mp, isdp->id_unit);
+ register_intr(ffs(isdp->id_irq) - 1, isdp->id_id,
+ isdp->id_ri_flags, isdp->id_intr,
+ mp, isdp->id_unit);
}
} else {
if (isdp->id_reconfig) {
OpenPOWER on IntegriCloud