diff options
| author | nate <nate@FreeBSD.org> | 1997-01-11 17:41:36 +0000 |
|---|---|---|
| committer | nate <nate@FreeBSD.org> | 1997-01-11 17:41:36 +0000 |
| commit | 785c77a90e54ad7e93ca72e0f2b6a33dbee7660e (patch) | |
| tree | 290b4d91a7b0ad3029d223e213b5e7fc0bcab556 /sys/i386 | |
| parent | c5b15215e52f7aa9e2eb74570d6714d0257f9303 (diff) | |
| download | FreeBSD-src-785c77a90e54ad7e93ca72e0f2b6a33dbee7660e.zip FreeBSD-src-785c77a90e54ad7e93ca72e0f2b6a33dbee7660e.tar.gz | |
Moved pccard_configure() to the end of the configure() list. This
avoids problems with the PCIC controller grabbing an interrupt that
another card needs.
Closes PR: kernel/2405
Reviewed by: bde
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/i386/autoconf.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index 409cda5..d8c487b 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91 - * $Id: autoconf.c,v 1.58 1996/12/18 18:53:00 bde Exp $ + * $Id: autoconf.c,v 1.59 1996/12/21 16:43:35 phk Exp $ */ /* @@ -176,11 +176,6 @@ configure(dummy) enable_intr(); INTREN(IRQ_SLAVE); -#if NCRD > 0 - /* Before isa_configure to avoid ISA drivers finding our cards */ - pccard_configure(); -#endif - #if NEISA > 0 eisa_configure(); #endif @@ -193,6 +188,11 @@ configure(dummy) isa_configure(); #endif +#if NCRD > 0 + /* After everyone else has a chance at grabbing resources */ + pccard_configure(); +#endif + if (setdumpdev(dumpdev) != 0) dumpdev = NODEV; |
