summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorNate Williams <nate@FreeBSD.org>1997-03-04 00:31:13 +0000
committerNate Williams <nate@FreeBSD.org>1997-03-04 00:31:13 +0000
commit97c31386d4dfa9cf314a86596466c46564e05a16 (patch)
tree77a9a9344eff6df3a1a1ca2a19c97512536181bb /sys
parentde6d2cb7e56581cdeb4abbabc20e96fa1013b4b7 (diff)
Notes
Diffstat (limited to 'sys')
-rw-r--r--sys/i386/i386/autoconf.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index 68c3aec4b217..11d0829013a1 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.56.2.2 1996/12/21 18:16:16 bde Exp $
+ * $Id: autoconf.c,v 1.56.2.3 1996/12/21 18:55:34 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;