diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-08-01 01:36:25 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-08-01 01:36:25 +0000 |
| commit | f8c1e1d4fb2463174d83a15a92f27ef92de12927 (patch) | |
| tree | 5189370b5af332ab46bede5af2be9267312e6114 /sys/dev/eisa/ahc_eisa.c | |
| parent | c687673d07b86c9c0900ea5ed26f17ec48e898c8 (diff) | |
Fold in relevant bits of the most recent two updates from
gibbs@freebsd.
Large commit messages detailing all changes can be read at revisions
1.97 and 1.100 of aic7xxx.c:
www.freebsd.org/cgi/cvsweb.cgi/src/sys/dev/aic7xxx/aic7xxx.c
Tested by marco, nate and pefo. Fixed broken system for nate.
ok marco@
Diffstat (limited to 'sys/dev/eisa/ahc_eisa.c')
| -rw-r--r-- | sys/dev/eisa/ahc_eisa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/eisa/ahc_eisa.c b/sys/dev/eisa/ahc_eisa.c index 6aef89b1ed8..0168358ee4e 100644 --- a/sys/dev/eisa/ahc_eisa.c +++ b/sys/dev/eisa/ahc_eisa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahc_eisa.c,v 1.16 2003/12/24 23:41:39 krw Exp $ */ +/* $OpenBSD: ahc_eisa.c,v 1.17 2004/08/01 01:36:23 krw Exp $ */ /* $NetBSD: ahc_eisa.c,v 1.10 1996/10/21 22:30:58 thorpej Exp $ */ /* @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ahc_eisa.c,v 1.16 2003/12/24 23:41:39 krw Exp $ + * $Id: ahc_eisa.c,v 1.17 2004/08/01 01:36:23 krw Exp $ */ #include "eisa.h" @@ -182,7 +182,7 @@ void *aux; ahc->bugs |= AHC_TMODE_WIDEODD_BUG; ahc->flags |= AHC_PAGESCBS; - if (ahc_reset(ahc) != 0) + if (ahc_reset(ahc, /*reinit*/FALSE) != 0) return; /* See if we are edge triggered */ |