diff options
| -rw-r--r-- | sys/amd64/amd64/autoconf.c | 12 | ||||
| -rw-r--r-- | sys/i386/i386/autoconf.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index 409cda59940e..d8c487bc1fc3 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/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; diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index 409cda59940e..d8c487bc1fc3 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; |