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/arch/i386/isa | |
| 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/arch/i386/isa')
| -rw-r--r-- | sys/arch/i386/isa/ahc_isa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/isa/ahc_isa.c b/sys/arch/i386/isa/ahc_isa.c index da74e31f27c..c385c554cf6 100644 --- a/sys/arch/i386/isa/ahc_isa.c +++ b/sys/arch/i386/isa/ahc_isa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ahc_isa.c,v 1.12 2003/12/24 23:39:40 krw Exp $ */ +/* $OpenBSD: ahc_isa.c,v 1.13 2004/08/01 01:36:23 krw Exp $ */ /* $NetBSD: ahc_isa.c,v 1.5 1996/10/21 22:27:39 thorpej Exp $ */ /* @@ -397,7 +397,7 @@ ahc_isa_attach(parent, self, aux) ahc->pause & IRQMS ? "Level Sensitive" : "Edge Triggered"); #endif - if (ahc_reset(ahc) != 0) + if (ahc_reset(ahc, /*reinit*/FALSE) != 0) return; /* See if we are edge triggered */ |