diff options
| author | Steven Wallace <swallace@FreeBSD.org> | 1994-09-30 05:35:55 +0000 |
|---|---|---|
| committer | Steven Wallace <swallace@FreeBSD.org> | 1994-09-30 05:35:55 +0000 |
| commit | 085d9ce09a398fab84fa3ed0e151ea66ff52f05b (patch) | |
| tree | a01a342cb1bcd82698732ddc0e467b687624c1df | |
| parent | 60ef79be3f7186f59d28f6c45ca3cc69f29782f0 (diff) | |
Notes
| -rw-r--r-- | sys/amd64/isa/isa.c | 7 | ||||
| -rw-r--r-- | sys/i386/isa/isa.c | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index f4373952a985..2cd9d2367f83 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.24 1994/09/13 17:06:47 phk Exp $ + * $Id: isa.c,v 1.25 1994/09/20 05:07:11 bde Exp $ */ /* @@ -327,6 +327,9 @@ config_isadev(isdp, mp) 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 @@ -389,7 +392,9 @@ config_isadev(isdp, mp) * check for IRQs and force a check for IRQs in the next * group of checks. */ +#ifndef ALLOW_CONFLICT_IRQ checkbits |= CC_IRQ; +#endif if (haveseen_isadev(isdp, checkbits)) return; isdp->id_alive = id_alive; diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index f4373952a985..2cd9d2367f83 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.24 1994/09/13 17:06:47 phk Exp $ + * $Id: isa.c,v 1.25 1994/09/20 05:07:11 bde Exp $ */ /* @@ -327,6 +327,9 @@ config_isadev(isdp, mp) 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 @@ -389,7 +392,9 @@ config_isadev(isdp, mp) * check for IRQs and force a check for IRQs in the next * group of checks. */ +#ifndef ALLOW_CONFLICT_IRQ checkbits |= CC_IRQ; +#endif if (haveseen_isadev(isdp, checkbits)) return; isdp->id_alive = id_alive; |