diff options
| author | bde <bde@FreeBSD.org> | 1994-10-19 21:57:51 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1994-10-19 21:57:51 +0000 |
| commit | 942fc20db79a2dffae511f2d1336eaf104e14a0f (patch) | |
| tree | 1ae5a09c7c708b5c52b9df8f7dc3446cd03cfb06 /sys | |
| parent | b0fbd5a81dcc3ee58a459121ddcd259c6bd4f4ae (diff) | |
| download | FreeBSD-src-942fc20db79a2dffae511f2d1336eaf104e14a0f.zip FreeBSD-src-942fc20db79a2dffae511f2d1336eaf104e14a0f.tar.gz | |
Don't check for IRQ conflicts before probing the device, so that
drivers have a chance to change their IRQ before it is checked.
This was implemented in revision 1.21 and broken in revision 1.26.
Drivers that can change their IRQ should probably be configured
with "irq ?".
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/isa/isa.c | 5 | ||||
| -rw-r--r-- | sys/i386/isa/isa.c | 5 |
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 |
