diff options
| author | alm <alm@FreeBSD.org> | 1993-11-09 02:12:36 +0000 |
|---|---|---|
| committer | alm <alm@FreeBSD.org> | 1993-11-09 02:12:36 +0000 |
| commit | 46df0965e7f451ad96b7b2228baf8a45a9fb6fa6 (patch) | |
| tree | c34930bf28b041120fc6a4dc1378246b11007443 /sys | |
| parent | d9ced6306c814855030339fcceb9f7a2aa33b71e (diff) | |
| download | FreeBSD-src-46df0965e7f451ad96b7b2228baf8a45a9fb6fa6.zip FreeBSD-src-46df0965e7f451ad96b7b2228baf8a45a9fb6fa6.tar.gz | |
Applied David Greenman's hack to disable IRQ conflict checking
when COM_MULTIPORT is defined.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/isa/isa.c | 4 | ||||
| -rw-r--r-- | sys/i386/isa/isa.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index 39e85bd..c98cc93 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.5 1993/10/18 18:45:48 rgrimes Exp $ + * $Id: isa.c,v 1.6 1993/11/07 21:47:19 wollman Exp $ */ /* @@ -147,6 +147,7 @@ haveseen(dvp, tmpdvp) status = 1; } } +#ifndef COM_MULTIPORT /* * Check for IRQ conflicts. */ @@ -157,6 +158,7 @@ haveseen(dvp, tmpdvp) status = 1; } } +#endif /* * Check for DRQ conflicts. */ diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index 39e85bd..c98cc93 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.5 1993/10/18 18:45:48 rgrimes Exp $ + * $Id: isa.c,v 1.6 1993/11/07 21:47:19 wollman Exp $ */ /* @@ -147,6 +147,7 @@ haveseen(dvp, tmpdvp) status = 1; } } +#ifndef COM_MULTIPORT /* * Check for IRQ conflicts. */ @@ -157,6 +158,7 @@ haveseen(dvp, tmpdvp) status = 1; } } +#endif /* * Check for DRQ conflicts. */ |
