mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-17 10:26:15 +00:00
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
This commit is contained in:
parent
341460c3b5
commit
796c9a39d8
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=21540
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user