- 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, 3 insertions, 9 deletions

diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c
index 83e16bc..72871d8 100644
--- a/sys/i386/isa/if_ed.c
+++ b/sys/i386/isa/if_ed.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_ed.c,v 1.122 1997/10/03 16:26:15 davidg Exp $
+ *	$Id: if_ed.c,v 1.124 1997/10/26 04:53:51 nate Exp $
  */
 
 /*
@@ -205,6 +205,8 @@ static struct pccard_device ed_info = {
 				/* XXX - Should this also include net_imask? */
 };
 
+DATA_SET(pccarddrv_set, ed_info);
+
 /*
  *	Initialize the device - called from Slot manager.
  */
@@ -340,14 +342,6 @@ ed_probe(isa_dev)
 {
 	int     nports;
 
-#if NCARD > 0
-	/*
-	 * If PC-Card probe required, then register driver with
-	 * slot manager.
-	 */
-	pccard_add_driver(&ed_info);
-#endif
-
 	nports = ed_probe_WD80x3(isa_dev);
 	if (nports)
 		return (nports);