- Instead of relying on a functional call to register PCARD-capable drivers,

  use a Linker Set.  Note, if a driver is loaded as an LKM  if will have
  to use the function call, but since none of the existing drivers
  are loadable, this made things cleaner and boot messages nicer.

Obtained from:	PAO-970616

1 files changed, 4 insertions, 5 deletions

diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c
index d840c53..e5db617 100644
--- a/sys/i386/isa/if_ep.c
+++ b/sys/i386/isa/if_ep.c
@@ -38,7 +38,7 @@
  */
 
 /*
- *  $Id: if_ep.c,v 1.61 1997/10/14 06:56:08 itojun Exp $
+ *  $Id: if_ep.c,v 1.63 1997/10/26 04:53:53 nate Exp $
  *
  *  Promiscuous mode added and interrupt logic slightly changed
  *  to reduce the number of adapter failures. Transceiver select
@@ -63,6 +63,7 @@
 
 #include <sys/param.h>
 #if defined(__FreeBSD__)
+#include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 #endif
@@ -167,6 +168,8 @@ static struct pccard_device ep_info = {
     &net_imask
 };
 
+DATA_SET(pccarddrv_set, ep_info);
+
 /*
  * Initialize the device - called from Slot manager.
  */
@@ -473,10 +476,6 @@ ep_isa_probe(is)
     struct ep_board *epb;
     u_short k;
 
-#if NCARD > 0
-    pccard_add_driver(&ep_info);
-#endif
-
     if ((epb = ep_look_for_board_at(is)) == 0)
 	return (0);