diff options
| author | ache <ache@FreeBSD.org> | 1997-06-08 16:43:37 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1997-06-08 16:43:37 +0000 |
| commit | d219e7f0ddb30cdd388fba5371f5a20504323f1d (patch) | |
| tree | 3536a2d56f4ec0580e521abee4c3ec60ba76af81 /sys/i386/isa/isa.c | |
| parent | ff4b478227c7e2f7b5feb49d0be9e2029963b28b (diff) | |
| download | FreeBSD-src-d219e7f0ddb30cdd388fba5371f5a20504323f1d.zip FreeBSD-src-d219e7f0ddb30cdd388fba5371f5a20504323f1d.tar.gz | |
Make "conflicts" keyword work again
Diffstat (limited to 'sys/i386/isa/isa.c')
| -rw-r--r-- | sys/i386/isa/isa.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index ccadc08..9af74ec 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.88 1997/05/31 09:27:31 peter Exp $ + * $Id: isa.c,v 1.89 1997/06/02 08:19:05 dfr Exp $ */ /* @@ -537,9 +537,10 @@ config_isadev_c(isdp, mp, reconfig) undirect_isa_irq(rirq); /* free for ISA */ } #endif /* APIC_IO */ - register_intr(ffs(isdp->id_irq) - 1, isdp->id_id, - isdp->id_ri_flags, isdp->id_intr, - mp, isdp->id_unit); + if (!isdp->id_conflicts) + 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) { |
