diff --git a/src/drivers/net/3c595.c b/src/drivers/net/3c595.c
index e8fc377d..489e8827 100644
--- a/src/drivers/net/3c595.c
+++ b/src/drivers/net/3c595.c
@@ -533,14 +533,10 @@ PCI_ROM(0x10b7, 0x7646, "3csoho100-tx-1",  "3CSOHO100-TX"),	/* Hurricane */
 PCI_ROM(0x10b7, 0x4500, "3c450-1",         "3Com450 HomePNA Tornado"),
 };
 
-static struct pci_driver t595_driver __pci_driver = {
-	.type     = NIC_DRIVER,
-	.name     = "3C595",
-	.probe    = t595_probe,
-	.ids      = t595_nics,
-	.id_count = sizeof(t595_nics)/sizeof(t595_nics[0]),
-	.class    = 0,
-};
+static struct pci_driver t595_driver =
+	PCI_DRIVER ( "3C595", t595_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "3C595", t595_probe );
 
 /*
  * Local variables:
diff --git a/src/drivers/net/3c90x.c b/src/drivers/net/3c90x.c
index 1c8b7e44..7919c9e5 100644
--- a/src/drivers/net/3c90x.c
+++ b/src/drivers/net/3c90x.c
@@ -986,11 +986,7 @@ PCI_ROM(0x10b7, 0x1201, "3c982a",        "3Com982A"),
 PCI_ROM(0x10b7, 0x1202, "3c982b",        "3Com982B"),
 };
 
-static struct pci_driver a3c90x_driver __pci_driver = {
-	.type     = NIC_DRIVER,
-	.name     = "3C90X",
-	.probe    = a3c90x_probe,
-	.ids      = a3c90x_nics,
-	.id_count = sizeof(a3c90x_nics)/sizeof(a3c90x_nics[0]),
-	.class    = 0,
-};
+static struct pci_driver a3c90x_driver =
+	PCI_DRIVER ( "3C90X", a3c90x_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "3C90X", a3c90x_probe );
diff --git a/src/drivers/net/davicom.c b/src/drivers/net/davicom.c
index 1d0235f4..c8856289 100644
--- a/src/drivers/net/davicom.c
+++ b/src/drivers/net/davicom.c
@@ -710,11 +710,7 @@ PCI_ROM(0x1282, 0x9009, "davicom9009", "Davicom 9009"),
 PCI_ROM(0x1282, 0x9132, "davicom9132", "Davicom 9132"),	/* Needs probably some fixing */
 };
 
-static struct pci_driver davicom_driver __pci_driver = {
-	.type     = NIC_DRIVER,
-	.name     = "DAVICOM",
-	.probe    = davicom_probe,
-	.ids      = davicom_nics,
-	.id_count = sizeof(davicom_nics)/sizeof(davicom_nics[0]),
-	.class    = 0,
-};
+static struct pci_driver davicom_driver =
+	PCI_DRIVER ( "DAVICOM", davicom_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "DAVICOM", davicom_probe );
diff --git a/src/drivers/net/dmfe.c b/src/drivers/net/dmfe.c
index 10c47773..9545ee9d 100644
--- a/src/drivers/net/dmfe.c
+++ b/src/drivers/net/dmfe.c
@@ -1220,11 +1220,7 @@ static struct pci_id dmfe_nics[] = {
 	PCI_ROM(0x1282, 0x9132, "dmfe9132", "Davicom 9132"),	/* Needs probably some fixing */
 };
 
-static struct pci_driver dmfe_driver __pci_driver = {
-	.type = NIC_DRIVER,
-	.name = "DMFE/PCI",
-	.probe = dmfe_probe,
-	.ids = dmfe_nics,
-	.id_count = sizeof(dmfe_nics) / sizeof(dmfe_nics[0]),
-	.class = 0,
-};
+static struct pci_driver dmfe_driver =
+	PCI_DRIVER ( "DMFE/PCI", dmfe_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "DMFE/PCI", dmfe_probe );
diff --git a/src/drivers/net/e1000.c b/src/drivers/net/e1000.c
index 7c572656..4def9e4c 100644
--- a/src/drivers/net/e1000.c
+++ b/src/drivers/net/e1000.c
@@ -3703,11 +3703,7 @@ PCI_ROM(0x8086, 0x107a, "e1000-82546gb-fiber",	     "Intel EtherExpressPro1000 8
 PCI_ROM(0x8086, 0x107b, "e1000-82546gb-serdes",	     "Intel EtherExpressPro1000 82546GB SERDES"),
 };
 
-static struct pci_driver e1000_driver __pci_driver = {
-	.type     = NIC_DRIVER,
-	.name     = "E1000",
-	.probe    = e1000_probe,
-	.ids      = e1000_nics,
-	.id_count = sizeof(e1000_nics)/sizeof(e1000_nics[0]),
-	.class    = 0,
-};
+static struct pci_driver e1000_driver =
+	PCI_DRIVER ( "E1000", e1000_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "E1000", e1000_probe );
diff --git a/src/drivers/net/eepro100.c b/src/drivers/net/eepro100.c
index e10bc84b..3028e810 100644
--- a/src/drivers/net/eepro100.c
+++ b/src/drivers/net/eepro100.c
@@ -831,11 +831,7 @@ PCI_ROM(0x8086, 0x5201, "eepro100-5201", "Intel EtherExpress PRO/100 Intelligent
  * 2003/03/17 gbaum */
 
 
-static struct pci_driver eepro100_driver __pci_driver = {
-	.type      = NIC_DRIVER,
-	.name      = "EEPRO100",
-	.probe     = eepro100_probe,
-	.ids       = eepro100_nics,
-	.id_count  = sizeof(eepro100_nics)/sizeof(eepro100_nics[0]),
-	.class     = 0
-};
+static struct pci_driver eepro100_driver =
+	PCI_DRIVER ( "EEPRO100", eepro100_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "EEPRO100", eepro100_probe );
diff --git a/src/drivers/net/epic100.c b/src/drivers/net/epic100.c
index cd83edf4..3f96f046 100644
--- a/src/drivers/net/epic100.c
+++ b/src/drivers/net/epic100.c
@@ -510,11 +510,7 @@ PCI_ROM(0x10b8, 0x0005, "epic100",    "SMC EtherPowerII"),		/* SMC 83c170 EPIC/1
 PCI_ROM(0x10b8, 0x0006, "smc-83c175", "SMC EPIC/C 83c175"),
 };
 
-static struct pci_driver epic100_driver __pci_driver = {
-	.type     = NIC_DRIVER,
-	.name     = "EPIC100",
-	.probe    = epic100_probe,
-	.ids      = epic100_nics,
-	.id_count = sizeof(epic100_nics)/sizeof(epic100_nics[0]),
-	.class    = 0,
-};
+static struct pci_driver epic100_driver =
+	PCI_DRIVER ( "EPIC100", epic100_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "EPIC100", epic100_probe );
diff --git a/src/drivers/net/forcedeth.c b/src/drivers/net/forcedeth.c
index 326c4cca..e5db3e7a 100644
--- a/src/drivers/net/forcedeth.c
+++ b/src/drivers/net/forcedeth.c
@@ -1029,11 +1029,7 @@ static struct pci_id forcedeth_nics[] = {
 	PCI_ROM(0x10de, 0x00D6, "nforce3", "nForce3 Ethernet Controller"),
 };
 
-static struct pci_driver forcedeth_driver __pci_driver = {
-	.type = NIC_DRIVER,
-	.name = "forcedeth",
-	.probe = forcedeth_probe,
-	.ids = forcedeth_nics,
-	.id_count = sizeof(forcedeth_nics) / sizeof(forcedeth_nics[0]),
-	.class = 0,
-};
+static struct pci_driver forcedeth_driver =
+	PCI_DRIVER ( "forcedeth", forcedeth_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "forcedeth", forcedeth_probe );
diff --git a/src/drivers/net/natsemi.c b/src/drivers/net/natsemi.c
index 73c1368d..0074a1d7 100644
--- a/src/drivers/net/natsemi.c
+++ b/src/drivers/net/natsemi.c
@@ -770,11 +770,7 @@ static struct pci_id natsemi_nics[] = {
 PCI_ROM(0x100b, 0x0020, "dp83815", "DP83815"),
 };
 
-static struct pci_driver natsemi_driver __pci_driver = {
-	.type     = NIC_DRIVER,
-	.name     = "NATSEMI",
-	.probe    = natsemi_probe,
-	.ids      = natsemi_nics,
-	.id_count = sizeof(natsemi_nics)/sizeof(natsemi_nics[0]),
-	.class    = 0,
-};
+static struct pci_driver natsemi_driver =
+	PCI_DRIVER ( "NATSEMI", natsemi_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "NATSEMI", natsemi_probe );
diff --git a/src/drivers/net/ns83820.c b/src/drivers/net/ns83820.c
index 34f6f50d..14f50806 100755
--- a/src/drivers/net/ns83820.c
+++ b/src/drivers/net/ns83820.c
@@ -1010,11 +1010,7 @@ static struct pci_id ns83820_nics[] = {
 	PCI_ROM(0x100b, 0x0022, "ns83820", "National Semiconductor 83820"),
 };
 
-static struct pci_driver ns83820_driver __pci_driver = {
-	.type = NIC_DRIVER,
-	.name = "NS83820/PCI",
-	.probe = ns83820_probe,
-	.ids = ns83820_nics,
-	.id_count = sizeof(ns83820_nics) / sizeof(ns83820_nics[0]),
-	.class = 0,
-};
+static struct pci_driver ns83820_driver =
+	PCI_DRIVER ( "NS83820/PCI", ns83820_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "NS83820/PCI", ns83820_probe );
diff --git a/src/drivers/net/ns8390.c b/src/drivers/net/ns8390.c
index 5a18c8e6..1533a406 100644
--- a/src/drivers/net/ns8390.c
+++ b/src/drivers/net/ns8390.c
@@ -1000,14 +1000,10 @@ PCI_ROM(0x10bd, 0x0e34, "surecom-ne34", "Surecom NE34"),
 PCI_ROM(0x1106, 0x0926, "via86c926",    "Via 86c926"),
 };
 
-static struct pci_driver nepci_driver __pci_driver = {
-	.type     = NIC_DRIVER,
-	.name     = "NE2000/PCI",
-	.probe    = nepci_probe,
-	.ids      = nepci_nics,
-	.id_count = sizeof(nepci_nics)/sizeof(nepci_nics[0]),
-	.class    = 0,
-};
+static struct pci_driver nepci_driver =
+	PCI_DRIVER ( "NE2000/PCI", nepci_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "NE2000/PCI", nepci_probe );
 
 #endif /* INCLUDE_NS8390 */
 
diff --git a/src/drivers/net/pcnet32.c b/src/drivers/net/pcnet32.c
index c2fb897a..27470339 100644
--- a/src/drivers/net/pcnet32.c
+++ b/src/drivers/net/pcnet32.c
@@ -994,11 +994,7 @@ static struct pci_id pcnet32_nics[] = {
 	PCI_ROM(0x1022, 0x2001, "amdhomepna", "AMD Lance/HomePNA"),
 };
 
-static struct pci_driver pcnet32_driver __pci_driver = {
-	.type = NIC_DRIVER,
-	.name = "PCNET32/PCI",
-	.probe = pcnet32_probe,
-	.ids = pcnet32_nics,
-	.id_count = sizeof(pcnet32_nics) / sizeof(pcnet32_nics[0]),
-	.class = 0,
-};
+static struct pci_driver pcnet32_driver =
+	PCI_DRIVER ( "PCNET32/PCI", pcnet32_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "PCNET32/PCI", pcnet32_probe );
diff --git a/src/drivers/net/prism2_pci.c b/src/drivers/net/prism2_pci.c
index 4aafb4ff..1d4ea31c 100644
--- a/src/drivers/net/prism2_pci.c
+++ b/src/drivers/net/prism2_pci.c
@@ -23,12 +23,8 @@ PCI_ROM(0x1260, 0x3873, "hwp01170",	"ActionTec HWP01170"),
 PCI_ROM(0x1260, 0x3873, "dwl520",	"DLink DWL-520"),
 };
 
-static struct pci_driver prism2_pci_driver __pci_driver = {
-	.type     = NIC_DRIVER,
-	.name     = "Prism2_PCI",
-	.probe    = prism2_pci_probe,
-	.ids      = prism2_pci_nics,
-	.id_count = sizeof(prism2_pci_nics)/sizeof(prism2_pci_nics[0]),
-	.class    = 0,
-};
+static struct pci_driver prism2_pci_driver =
+	PCI_DRIVER ( "Prism2_PCI", prism2_pci_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "Prism2_PCI", prism2_pci_probe );
 
diff --git a/src/drivers/net/prism2_plx.c b/src/drivers/net/prism2_plx.c
index 65954f75..59b80fad 100644
--- a/src/drivers/net/prism2_plx.c
+++ b/src/drivers/net/prism2_plx.c
@@ -31,12 +31,8 @@ PCI_ROM(0xec80, 0xec00, "f5d6000",       "Belkin F5D6000"),
 PCI_ROM(0x126c, 0x8030, "emobility",     "Nortel emobility"),
 };
 
-static struct pci_driver prism2_plx_driver __pci_driver = {
-	.type     = NIC_DRIVER,
-	.name     = "Prism2_PLX",
-	.probe    = prism2_plx_probe,
-	.ids      = prism2_plx_nics,
-	.id_count = sizeof(prism2_plx_nics)/sizeof(prism2_plx_nics[0]),
-	.class    = 0,
-};
+static struct pci_driver prism2_plx_driver =
+	PCI_DRIVER ( "Prism2_PLX", prism2_plx_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "Prism2_PLX", prism2_plx_probe );
 
diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c
index 83373dee..516d306a 100644
--- a/src/drivers/net/r8169.c
+++ b/src/drivers/net/r8169.c
@@ -844,11 +844,7 @@ static struct pci_id r8169_nics[] = {
 	PCI_ROM(0x10ec, 0x8169, "r8169", "RealTek RTL8169 Gigabit Ethernet"),
 };
 
-static struct pci_driver r8169_driver __pci_driver = {
-	.type = NIC_DRIVER,
-	.name = "r8169/PCI",
-	.probe = r8169_probe,
-	.ids = r8169_nics,
-	.id_count = sizeof(r8169_nics) / sizeof(r8169_nics[0]),
-	.class = 0,
-};
+static struct pci_driver r8169_driver =
+	PCI_DRIVER ( "r8169/PCI", r8169_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "r8169/PCI", r8169_probe );
diff --git a/src/drivers/net/rtl8139.c b/src/drivers/net/rtl8139.c
index ee078d54..485e39e8 100644
--- a/src/drivers/net/rtl8139.c
+++ b/src/drivers/net/rtl8139.c
@@ -541,11 +541,7 @@ PCI_ROM(0x14ea, 0xab07, "fnw3800tx",     "Planex FNW-3800-TX"),
 PCI_ROM(0xffff, 0x8139, "clone-rtl8139", "Cloned 8139"),
 };
 
-static struct pci_driver rtl8139_driver __pci_driver = {
-	.type     = NIC_DRIVER,
-	.name     = "RTL8139",
-	.probe    = rtl8139_probe,
-	.ids      = rtl8139_nics,
-	.id_count = sizeof(rtl8139_nics)/sizeof(rtl8139_nics[0]),
-	.class    = 0,
-};
+static struct pci_driver rtl8139_driver =
+	PCI_DRIVER ( "RTL8139", rtl8139_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "RTL8139", rtl8139_probe );
diff --git a/src/drivers/net/sis900.c b/src/drivers/net/sis900.c
index 282c0908..822c6320 100644
--- a/src/drivers/net/sis900.c
+++ b/src/drivers/net/sis900.c
@@ -1254,11 +1254,7 @@ PCI_ROM(0x1039, 0x0900, "sis900",  "SIS900"),
 PCI_ROM(0x1039, 0x7016, "sis7016", "SIS7016"),
 };
 
-static struct pci_driver sis900_driver __pci_driver = {
-	.type     = NIC_DRIVER,
-	.name     = "SIS900",
-	.probe    = sis900_probe,
-	.ids      = sis900_nics,
-	.id_count = sizeof(sis900_nics)/sizeof(sis900_nics[0]),
-	.class    = 0,
-};
+static struct pci_driver sis900_driver =
+	PCI_DRIVER ( "SIS900", sis900_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "SIS900", sis900_probe );
diff --git a/src/drivers/net/skel.c b/src/drivers/net/skel.c
index 4b7f103a..f020bcb5 100644
--- a/src/drivers/net/skel.c
+++ b/src/drivers/net/skel.c
@@ -158,14 +158,10 @@ static struct pci_id skel_nics[] = {
 PCI_ROM(0x0000, 0x0000, "skel-pci", "Skeleton PCI Adaptor"),
 };
 
-static struct pci_driver skel_driver __pci_driver = {
-	.type     = NIC_DRIVER,
-	.name     = "SKELETON/PCI",
-	.probe    = skel_probe,
-	.ids      = skel_nics,
-	.id_count = sizeof(skel_nics)/sizeof(skel_nics[0]),
-	.class    = 0,
-};
+static struct pci_driver skel_driver =
+	PCI_DRIVER ( "SKELETON/PCI", skel_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "SKELETON/PCI", skel_probe );
 
 /**************************************************************************
 PROBE - Look for an adapter, this routine's visible to the outside
diff --git a/src/drivers/net/sundance.c b/src/drivers/net/sundance.c
index 4912a121..d25848ac 100644
--- a/src/drivers/net/sundance.c
+++ b/src/drivers/net/sundance.c
@@ -881,11 +881,7 @@ static struct pci_id sundance_nics[] = {
 	PCI_ROM(0x1186, 0x1002, "dfe530txs", "D-Link DFE530TXS (Sundance ST201 Alta)"),
 };
 
-static struct pci_driver sundance_driver __pci_driver = {
-	.type = NIC_DRIVER,
-	.name = "SUNDANCE/PCI",
-	.probe = sundance_probe,
-	.ids = sundance_nics,
-	.id_count = sizeof(sundance_nics) / sizeof(sundance_nics[0]),
-	.class = 0,
-};
+static struct pci_driver sundance_driver =
+	PCI_DRIVER ( "SUNDANCE/PCI", sundance_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "SUNDANCE/PCI", sundance_probe );
diff --git a/src/drivers/net/tg3.c b/src/drivers/net/tg3.c
index e1db54e6..288d394c 100644
--- a/src/drivers/net/tg3.c
+++ b/src/drivers/net/tg3.c
@@ -3384,11 +3384,7 @@ PCI_ROM(0x173b, 0x03ea, "tg3-ac9100",      "Altima AC9100"),
 PCI_ROM(0x173b, 0x03eb, "tg3-ac1003",      "Altima AC1003"),
 };
 
-static struct pci_driver tg3_driver __pci_driver = {
-	.type	  = NIC_DRIVER,
-	.name	  = "TG3",
-	.probe	  = tg3_probe,
-	.ids	  = tg3_nics,
-	.id_count = sizeof(tg3_nics)/sizeof(tg3_nics[0]),
-	.class    = 0,
-};
+static struct pci_driver tg3_driver =
+	PCI_DRIVER ( "TG3", tg3_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "TG3", tg3_probe );
diff --git a/src/drivers/net/tlan.c b/src/drivers/net/tlan.c
index 0f216ed4..5478de5f 100644
--- a/src/drivers/net/tlan.c
+++ b/src/drivers/net/tlan.c
@@ -1712,11 +1712,7 @@ static struct pci_id tlan_nics[] = {
 	PCI_ROM(0x0e11, 0xb012, "netelligent_10_t2", "Compaq Netelligent 10 T/2 PCI UTP/Coax"),
 };
 
-static struct pci_driver tlan_driver __pci_driver = {
-	.type = NIC_DRIVER,
-	.name = "TLAN/PCI",
-	.probe = tlan_probe,
-	.ids = tlan_nics,
-	.id_count = sizeof(tlan_nics) / sizeof(tlan_nics[0]),
-	.class = 0,
-};
+static struct pci_driver tlan_driver =
+	PCI_DRIVER ( "TLAN/PCI", tlan_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "TLAN/PCI", tlan_probe );
diff --git a/src/drivers/net/tulip.c b/src/drivers/net/tulip.c
index 23fca665..570726f7 100644
--- a/src/drivers/net/tulip.c
+++ b/src/drivers/net/tulip.c
@@ -2072,11 +2072,7 @@ PCI_ROM(0x1737, 0xab08, "tulip-1737-ab08","Tulip 0x1737 0xab08"),
 PCI_ROM(0x1737, 0xab09, "tulip-ab09",  "Tulip 0x1737 0xab09"),
 };
 
-static struct pci_driver tulip_driver __pci_driver = {
-	.type     = NIC_DRIVER,
-	.name     = "Tulip",
-	.probe    = tulip_probe,
-	.ids      = tulip_nics,
-	.id_count = sizeof(tulip_nics)/sizeof(tulip_nics[0]),
-	.class    = 0,
-};
+static struct pci_driver tulip_driver =
+	PCI_DRIVER ( "Tulip", tulip_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "Tulip", tulip_probe );
diff --git a/src/drivers/net/w89c840.c b/src/drivers/net/w89c840.c
index 27a81eda..f7dc2888 100644
--- a/src/drivers/net/w89c840.c
+++ b/src/drivers/net/w89c840.c
@@ -948,11 +948,7 @@ PCI_ROM(0x1050, 0x0840, "winbond840",     "Winbond W89C840F"),
 PCI_ROM(0x11f6, 0x2011, "compexrl100atx", "Compex RL100ATX"),
 };
 
-static struct pci_driver w89c840_driver __pci_driver = {
-	.type     = NIC_DRIVER,
-	.name     = "W89C840F",
-	.probe    = w89c840_probe,
-	.ids      = w89c840_nics,
-	.id_count = sizeof(w89c840_nics)/sizeof(w89c840_nics[0]),
-	.class    = 0,
-};
+static struct pci_driver w89c840_driver =
+	PCI_DRIVER ( "W89C840F", w89c840_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "W89C840F", w89c840_probe );