diff options
| author | ache <ache@FreeBSD.org> | 1997-07-09 17:58:16 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1997-07-09 17:58:16 +0000 |
| commit | 7d8d720ba60fca1340d61d3dfae258ac9da96d41 (patch) | |
| tree | 3060d04b501dffbd92ab46dfaa12581337d3cb96 /sys/i386/isa/isa.c | |
| parent | ff033633dade409fc92d72253cd50b7bc75b1b88 (diff) | |
| download | FreeBSD-src-7d8d720ba60fca1340d61d3dfae258ac9da96d41.zip FreeBSD-src-7d8d720ba60fca1340d61d3dfae258ac9da96d41.tar.gz | |
Back out my changes with 'conflicts' keyword for IRQs,
sounddriver fixed now.
Diffstat (limited to 'sys/i386/isa/isa.c')
| -rw-r--r-- | sys/i386/isa/isa.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 31c8955..0420ea9 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.2 1997/06/25 20:12:23 smp Exp smp $ + * $Id: isa.c,v 1.93 1997/06/25 21:00:00 fsmp Exp $ */ /* @@ -537,14 +537,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) { |
