diff --git a/src/drivers/net/3c509-eisa.c b/src/drivers/net/3c509-eisa.c
index 33861769..a82fd942 100644
--- a/src/drivers/net/3c509-eisa.c
+++ b/src/drivers/net/3c509-eisa.c
@@ -31,8 +31,7 @@ static struct eisa_id el3_eisa_adapters[] = {
 	{ "3Com 3c509 EtherLink III (EISA)", MFG_ID, PROD_ID },
 };
 
-static struct eisa_driver el3_eisa_driver =
-	EISA_DRIVER ( el3_eisa_adapters );
+EISA_DRIVER ( el3_eisa_driver, el3_eisa_adapters );
 
 DRIVER ( "3c509 (EISA)", nic_driver, eisa_driver, el3_eisa_driver,
 	 el3_eisa_probe, el3_eisa_disable );
diff --git a/src/drivers/net/3c515.c b/src/drivers/net/3c515.c
index 9edb3aab..7fcc9f0f 100644
--- a/src/drivers/net/3c515.c
+++ b/src/drivers/net/3c515.c
@@ -762,8 +762,7 @@ static struct isapnp_id t515_adapters[] = {
 	{ "3c515 (ISAPnP)", ISAPNP_VENDOR('T','C','M'), 0x5051 },
 };
 
-static struct isapnp_driver t515_driver =
-	ISAPNP_DRIVER ( t515_adapters );
+ISAPNP_DRIVER ( t515_driver, t515_adapters );
 
 DRIVER ( "3c515", nic_driver, isapnp_driver, t515_driver,
 	 t515_probe, t515_disable );
diff --git a/src/drivers/net/3c529.c b/src/drivers/net/3c529.c
index 794256c8..8cf795ac 100644
--- a/src/drivers/net/3c529.c
+++ b/src/drivers/net/3c529.c
@@ -45,8 +45,7 @@ static struct mca_id el3_mca_adapters[] = {
         { "3Com 3c529 EtherLink III (TP)", 0x62f7 },
 };
 
-static struct mca_driver t529_driver
-	= MCA_DRIVER ( el3_mca_adapters );
+MCA_DRIVER ( t529_driver, el3_mca_adapters );
 
 DRIVER ( "3c529", nic_driver, mca_driver, t529_driver,
 	 t529_probe, t529_disable );
diff --git a/src/drivers/net/3c595.c b/src/drivers/net/3c595.c
index cc7cfee2..ab10bc9d 100644
--- a/src/drivers/net/3c595.c
+++ b/src/drivers/net/3c595.c
@@ -539,8 +539,7 @@ 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 ( t595_nics, PCI_NO_CLASS );
+PCI_DRIVER ( t595_driver, t595_nics, PCI_NO_CLASS );
 
 DRIVER ( "3C595", nic_driver, pci_driver, t595_driver,
 	 t595_probe, t595_disable );
diff --git a/src/drivers/net/3c90x.c b/src/drivers/net/3c90x.c
index 061f954c..eee90691 100644
--- a/src/drivers/net/3c90x.c
+++ b/src/drivers/net/3c90x.c
@@ -992,8 +992,7 @@ PCI_ROM(0x10b7, 0x1201, "3c982a",        "3Com982A"),
 PCI_ROM(0x10b7, 0x1202, "3c982b",        "3Com982B"),
 };
 
-static struct pci_driver a3c90x_driver =
-	PCI_DRIVER ( a3c90x_nics, PCI_NO_CLASS );
+PCI_DRIVER ( a3c90x_driver, a3c90x_nics, PCI_NO_CLASS );
 
 DRIVER ( "3C90X", nic_driver, pci_driver, a3c90x_driver,
 	 a3c90x_probe, a3c90x_disable );
diff --git a/src/drivers/net/cs89x0.c b/src/drivers/net/cs89x0.c
index 9fc1ef76..35a9f81c 100644
--- a/src/drivers/net/cs89x0.c
+++ b/src/drivers/net/cs89x0.c
@@ -696,9 +696,8 @@ static isa_probe_addr_t cs89x0_probe_addrs[] = {
 #endif
 };
 
-static struct isa_driver cs89x0_driver =
-	ISA_DRIVER ( cs89x0_probe_addrs, cs89x0_probe_addr,
-		     ISAPNP_VENDOR('C','S','C'), 0x0007 );
+ISA_DRIVER ( cs89x0_driver, cs89x0_probe_addrs, cs89x0_probe_addr,
+	     ISAPNP_VENDOR('C','S','C'), 0x0007 );
 
 DRIVER ( "cs89x0", nic_driver, isa_driver, cs89x0_driver,
 	 cs89x0_probe, cs89x0_disable );
diff --git a/src/drivers/net/davicom.c b/src/drivers/net/davicom.c
index b32f8ecd..de2be331 100644
--- a/src/drivers/net/davicom.c
+++ b/src/drivers/net/davicom.c
@@ -713,8 +713,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 ( davicom_nics, PCI_NO_CLASS );
+PCI_DRIVER ( davicom_driver, davicom_nics, PCI_NO_CLASS );
 
 DRIVER ( "DAVICOM", nic_driver, pci_driver, davicom_driver,
 	 davicom_probe, davicom_disable );
diff --git a/src/drivers/net/depca.c b/src/drivers/net/depca.c
index d6da9b78..3707da64 100644
--- a/src/drivers/net/depca.c
+++ b/src/drivers/net/depca.c
@@ -793,8 +793,7 @@ static isa_probe_addr_t depca_probe_addrs[] = {
 	0x300, 0x200,
 };
 
-static struct isa_driver depca_driver =
-	ISA_DRIVER ( depca_probe_addrs, depca_probe1,
+ISA_DRIVER ( depca_driver, depca_probe_addrs, depca_probe1,
 		     GENERIC_ISAPNP_VENDOR, 0x80f7 );
 
 DRIVER ( "depce", nic_driver, isa_driver, depca_driver,
diff --git a/src/drivers/net/dmfe.c b/src/drivers/net/dmfe.c
index c0c3ffe4..9dba4775 100644
--- a/src/drivers/net/dmfe.c
+++ b/src/drivers/net/dmfe.c
@@ -1224,8 +1224,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 ( dmfe_nics, PCI_NO_CLASS );
+PCI_DRIVER ( dmfe_driver, dmfe_nics, PCI_NO_CLASS );
 
 DRIVER ( "DMFE/PCI", nic_driver, pci_driver, dmfe_driver,
 	 dmfe_probe, dmfe_disable );
diff --git a/src/drivers/net/e1000.c b/src/drivers/net/e1000.c
index f9f8c4a4..3dc8b889 100644
--- a/src/drivers/net/e1000.c
+++ b/src/drivers/net/e1000.c
@@ -3706,8 +3706,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 ( e1000_nics, PCI_NO_CLASS );
+PCI_DRIVER ( e1000_driver, e1000_nics, PCI_NO_CLASS );
 
 DRIVER ( "E1000", nic_driver, pci_driver, e1000_driver,
 	 e1000_probe, e1000_disable );
diff --git a/src/drivers/net/eepro.c b/src/drivers/net/eepro.c
index 6b6a7115..6c2318bd 100644
--- a/src/drivers/net/eepro.c
+++ b/src/drivers/net/eepro.c
@@ -584,7 +584,7 @@ static int eepro_probe ( struct nic *nic, struct isa_device *isa ) {
 	for (i = 0; i < ETH_ALEN; i++) {
 		nic->node_addr[i] = station_addr.caddr[i];
 	}
-	DBG("%s ioaddr %#hX, addr %!", dev->name, nic->ioaddr, nic->node_addr);
+	DBG("%s ioaddr %#hX, addr %!", isa->name, nic->ioaddr, nic->node_addr);
 	mem_start = RCV_LOWER_LIMIT << 8;
 	if ((mem_end & 0x3F) < 3 || (mem_end & 0x3F) > 29)
 		mem_end = RCV_UPPER_LIMIT << 8;
@@ -606,8 +606,7 @@ static isa_probe_addr_t eepro_probe_addrs[] = {
 	0x300, 0x210, 0x240, 0x280, 0x2C0, 0x200, 0x320, 0x340, 0x360,
 };
 
-static struct isa_driver eepro_driver =
-	ISA_DRIVER ( eepro_probe_addrs, eepro_probe1,
+ISA_DRIVER ( eepro_driver, eepro_probe_addrs, eepro_probe1,
 		     GENERIC_ISAPNP_VENDOR, 0x828a );
 
 DRIVER ( "eepro", nic_driver, isa_driver, eepro_driver,
diff --git a/src/drivers/net/eepro100.c b/src/drivers/net/eepro100.c
index b1a798e5..37987ad5 100644
--- a/src/drivers/net/eepro100.c
+++ b/src/drivers/net/eepro100.c
@@ -832,8 +832,7 @@ PCI_ROM(0x8086, 0x5201, "eepro100-5201", "Intel EtherExpress PRO/100 Intelligent
  * 2003/03/17 gbaum */
 
 
-static struct pci_driver eepro100_driver =
-	PCI_DRIVER ( eepro100_nics, PCI_NO_CLASS );
+PCI_DRIVER ( eepro100_driver, eepro100_nics, PCI_NO_CLASS );
 
 DRIVER ( "EEPRO100", nic_driver, pci_driver, eepro100_driver,
 	 eepro100_probe, eepro100_disable );
diff --git a/src/drivers/net/epic100.c b/src/drivers/net/epic100.c
index cc236fd6..cbbb7ac0 100644
--- a/src/drivers/net/epic100.c
+++ b/src/drivers/net/epic100.c
@@ -516,8 +516,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 ( epic100_nics, PCI_NO_CLASS );
+PCI_DRIVER ( epic100_driver, epic100_nics, PCI_NO_CLASS );
 
 DRIVER ( "EPIC100", nic_driver, pci_driver, epic100_driver,
 	 epic100_probe, epic100_disable );
diff --git a/src/drivers/net/forcedeth.c b/src/drivers/net/forcedeth.c
index c9b1040c..a3204cb4 100644
--- a/src/drivers/net/forcedeth.c
+++ b/src/drivers/net/forcedeth.c
@@ -932,8 +932,7 @@ static struct pci_id forcedeth_nics[] = {
 	PCI_ROM(0x10de, 0x00D6, "nforce3", "nForce3 Ethernet Controller"),
 };
 
-static struct pci_driver forcedeth_driver =
-	PCI_DRIVER ( forcedeth_nics, PCI_NO_CLASS );
+PCI_DRIVER ( forcedeth_driver, forcedeth_nics, PCI_NO_CLASS );
 
 /**************************************************************************
 PROBE - Look for an adapter, this routine's visible to the outside
diff --git a/src/drivers/net/mtd80x.c b/src/drivers/net/mtd80x.c
index 51d49022..72e4662e 100644
--- a/src/drivers/net/mtd80x.c
+++ b/src/drivers/net/mtd80x.c
@@ -668,8 +668,7 @@ static struct pci_id mtd80x_nics[] = {
         PCI_ROM(0x1516, 0x0891, "MTD891", "Myson MTD891"),
 };
 
-static struct pci_driver mtd80x_driver =
-	PCI_DRIVER ( mtd80x_nics, PCI_NO_CLASS );
+PCI_DRIVER ( mtd80x_driver, mtd80x_nics, PCI_NO_CLASS );
 
 /**************************************************************************
 PROBE - Look for an adapter, this routine's visible to the outside
diff --git a/src/drivers/net/natsemi.c b/src/drivers/net/natsemi.c
index 607faaf9..7966b858 100644
--- a/src/drivers/net/natsemi.c
+++ b/src/drivers/net/natsemi.c
@@ -776,8 +776,7 @@ static struct pci_id natsemi_nics[] = {
 PCI_ROM(0x100b, 0x0020, "dp83815", "DP83815"),
 };
 
-static struct pci_driver natsemi_driver =
-	PCI_DRIVER ( natsemi_nics, PCI_NO_CLASS );
+PCI_DRIVER ( natsemi_driver, natsemi_nics, PCI_NO_CLASS );
 
 DRIVER ( "NATSEMI", nic_driver, pci_driver, natsemi_driver,
 	 natsemi_probe, natsemi_disable );
diff --git a/src/drivers/net/ns83820.c b/src/drivers/net/ns83820.c
index ade11220..c29684c3 100755
--- a/src/drivers/net/ns83820.c
+++ b/src/drivers/net/ns83820.c
@@ -817,8 +817,7 @@ static struct pci_id ns83820_nics[] = {
 	PCI_ROM(0x100b, 0x0022, "ns83820", "National Semiconductor 83820"),
 };
 
-static struct pci_driver ns83820_driver =
-	PCI_DRIVER ( ns83820_nics, PCI_NO_CLASS );
+PCI_DRIVER ( ns83820_driver, ns83820_nics, PCI_NO_CLASS );
 
 /**************************************************************************
 PROBE - Look for an adapter, this routine's visible to the outside
diff --git a/src/drivers/net/ns8390.c b/src/drivers/net/ns8390.c
index 16cdb31f..6a950114 100644
--- a/src/drivers/net/ns8390.c
+++ b/src/drivers/net/ns8390.c
@@ -1006,8 +1006,7 @@ PCI_ROM(0x10bd, 0x0e34, "surecom-ne34", "Surecom NE34"),
 PCI_ROM(0x1106, 0x0926, "via86c926",    "Via 86c926"),
 };
 
-static struct pci_driver nepci_driver =
-	PCI_DRIVER ( "NE2000/PCI", nepci_nics, PCI_NO_CLASS );
+PCI_DRIVER ( nepci_driver, "NE2000/PCI", nepci_nics, PCI_NO_CLASS );
 
 BOOT_DRIVER ( "NE2000/PCI", nepci_probe );
 
diff --git a/src/drivers/net/pcnet32.c b/src/drivers/net/pcnet32.c
index 7b284447..10a71931 100644
--- a/src/drivers/net/pcnet32.c
+++ b/src/drivers/net/pcnet32.c
@@ -1000,8 +1000,7 @@ static struct pci_id pcnet32_nics[] = {
 	PCI_ROM(0x1022, 0x2001, "amdhomepna", "AMD Lance/HomePNA"),
 };
 
-static struct pci_driver pcnet32_driver =
-	PCI_DRIVER ( pcnet32_nics, PCI_NO_CLASS );
+PCI_DRIVER ( pcnet32_driver, pcnet32_nics, PCI_NO_CLASS );
 
 DRIVER ( "PCNET32/PCI", nic_driver, pci_driver, pcnet32_driver,
 	 pcnet32_probe, pcnet32_disable );
diff --git a/src/drivers/net/pnic.c b/src/drivers/net/pnic.c
index eee3a708..d38d04bd 100644
--- a/src/drivers/net/pnic.c
+++ b/src/drivers/net/pnic.c
@@ -246,8 +246,7 @@ static struct pci_id pnic_nics[] = {
 PCI_ROM ( 0xfefe, 0xefef, "pnic", "Bochs Pseudo NIC Adaptor" ),
 };
 
-static struct pci_driver pnic_driver =
-	PCI_DRIVER ( pnic_nics, PCI_NO_CLASS );
+PCI_DRIVER ( pnic_driver, pnic_nics, PCI_NO_CLASS );
 
 DRIVER ( "PNIC", nic_driver, pci_driver, pnic_driver,
 	 pnic_probe, pnic_disable );
diff --git a/src/drivers/net/prism2_pci.c b/src/drivers/net/prism2_pci.c
index bfad2fd2..19ab74a0 100644
--- a/src/drivers/net/prism2_pci.c
+++ b/src/drivers/net/prism2_pci.c
@@ -45,8 +45,7 @@ PCI_ROM(0x1260, 0x3873, "hwp01170",	"ActionTec HWP01170"),
 PCI_ROM(0x1260, 0x3873, "dwl520",	"DLink DWL-520"),
 };
 
-static struct pci_driver prism2_pci_driver =
-	PCI_DRIVER ( prism2_pci_nics, PCI_NO_CLASS );
+PCI_DRIVER ( prism2_pci_driver, prism2_pci_nics, PCI_NO_CLASS );
 
 DRIVER ( "Prism2/PCI", nic_driver, pci_driver, prism2_pci_driver,
 	 prism2_pci_probe, prism2_pci_disable );
diff --git a/src/drivers/net/prism2_plx.c b/src/drivers/net/prism2_plx.c
index 36c0c5af..bf6fb626 100644
--- a/src/drivers/net/prism2_plx.c
+++ b/src/drivers/net/prism2_plx.c
@@ -109,8 +109,7 @@ PCI_ROM(0xec80, 0xec00, "f5d6000",       "Belkin F5D6000"),
 PCI_ROM(0x126c, 0x8030, "emobility",     "Nortel emobility"),
 };
 
-static struct pci_driver prism2_plx_driver =
-	PCI_DRIVER ( prism2_plx_nics, PCI_NO_CLASS );
+PCI_DRIVER ( prism2_plx_driver, prism2_plx_nics, PCI_NO_CLASS );
 
 
 DRIVER ( "Prism2/PLX", nic_driver, pci_driver, prism2_plx_driver,
diff --git a/src/drivers/net/r8169.c b/src/drivers/net/r8169.c
index 4b02257b..de86bdd8 100644
--- a/src/drivers/net/r8169.c
+++ b/src/drivers/net/r8169.c
@@ -714,8 +714,7 @@ static struct pci_id r8169_nics[] = {
 	PCI_ROM(0x10ec, 0x8169, "r8169", "RealTek RTL8169 Gigabit Ethernet"),
 };
 
-static struct pci_driver r8169_driver =
-	PCI_DRIVER ( r8169_nics, PCI_NO_CLASS );
+PCI_DRIVER ( r8169_driver, r8169_nics, PCI_NO_CLASS );
 
 /**************************************************************************
 PROBE - Look for an adapter, this routine's visible to the outside
diff --git a/src/drivers/net/rtl8139.c b/src/drivers/net/rtl8139.c
index 7aabe93e..da5a765e 100644
--- a/src/drivers/net/rtl8139.c
+++ b/src/drivers/net/rtl8139.c
@@ -541,8 +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 ( rtl8139_nics, PCI_NO_CLASS );
+PCI_DRIVER ( rtl8139_driver, rtl8139_nics, PCI_NO_CLASS );
 
 DRIVER ( "RTL8139", nic_driver, pci_driver, rtl8139_driver,
 	 rtl8139_probe, rtl_disable );
diff --git a/src/drivers/net/sis900.c b/src/drivers/net/sis900.c
index 5738614f..eb80a52d 100644
--- a/src/drivers/net/sis900.c
+++ b/src/drivers/net/sis900.c
@@ -120,8 +120,7 @@ static struct pci_id   pci_isa_bridge_list[] = {
 		"SIS 85C503/5513 PCI to ISA bridge"},
 };
 
-static struct pci_driver sis_bridge_pci_driver =
-	PCI_DRIVER ( pci_isa_bridge_list, PCI_NO_CLASS );
+PCI_DRIVER ( sis_bridge_pci_driver, pci_isa_bridge_list, PCI_NO_CLASS );
 
 static struct device_driver sis_bridge_driver = {
     .name = "SIS ISA bridge",
@@ -1266,8 +1265,7 @@ PCI_ROM(0x1039, 0x0900, "sis900",  "SIS900"),
 PCI_ROM(0x1039, 0x7016, "sis7016", "SIS7016"),
 };
 
-static struct pci_driver sis900_driver =
-	PCI_DRIVER ( sis900_nics, PCI_NO_CLASS );
+PCI_DRIVER ( sis900_driver, sis900_nics, PCI_NO_CLASS );
 
 DRIVER ( "SIS900", nic_driver, pci_driver, sis900_driver,
 	 sis900_probe, sis900_disable );
diff --git a/src/drivers/net/skel.c b/src/drivers/net/skel.c
index 57e6ce3c..a96a78b2 100644
--- a/src/drivers/net/skel.c
+++ b/src/drivers/net/skel.c
@@ -200,8 +200,7 @@ static struct pci_id skel_pci_nics[] = {
 PCI_ROM ( 0x0000, 0x0000, "skel-pci", "Skeleton PCI Adapter" ),
 };
 
-static struct pci_driver skel_pci_driver =
-	PCI_DRIVER ( skel_pci_nics, PCI_NO_CLASS );
+PCI_DRIVER ( skel_pci_driver, skel_pci_nics, PCI_NO_CLASS );
 
 DRIVER ( "SKEL/PCI", nic_driver, pci_driver, skel_pci_driver,
 	 skel_pci_probe, skel_pci_disable );
@@ -241,8 +240,7 @@ static struct eisa_id skel_eisa_nics[] = {
 	{ "Skeleton EISA Adapter", EISA_VENDOR('S','K','L'), 0x0000 },
 };
 
-static struct eisa_driver skel_eisa_driver =
-	EISA_DRIVER ( skel_eisa_nics );
+EISA_DRIVER ( skel_eisa_driver, skel_eisa_nics );
 
 DRIVER ( "SKEL/EISA", nic_driver, eisa_driver, skel_eisa_driver,
 	 skel_eisa_probe, skel_eisa_disable );
@@ -284,8 +282,7 @@ static struct isapnp_id skel_isapnp_nics[] = {
 	{ "Skeleton ISAPnP Adapter", ISAPNP_VENDOR('S','K','L'), 0x0000 },
 };
 
-static struct isapnp_driver skel_isapnp_driver =
-	ISAPNP_DRIVER ( skel_isapnp_nics );
+ISAPNP_DRIVER ( skel_isapnp_driver, skel_isapnp_nics );
 
 DRIVER ( "SKEL/ISAPnP", nic_driver, isapnp_driver, skel_isapnp_driver,
 	 skel_isapnp_probe, skel_isapnp_disable );
@@ -331,8 +328,7 @@ static struct mca_id skel_mca_nics[] = {
 	{ "Skeleton MCA Adapter", 0x0000 },
 };
 
-static struct mca_driver skel_mca_driver =
-	MCA_DRIVER ( skel_mca_nics );
+MCA_DRIVER ( skel_mca_driver, skel_mca_nics );
 
 DRIVER ( "SKEL/MCA", nic_driver, mca_driver, skel_mca_driver,
 	 skel_mca_probe, skel_mca_disable );
@@ -394,8 +390,7 @@ static isa_probe_addr_t skel_isa_probe_addrs[] = {
 	*/
 };
 
-static struct isa_driver skel_isa_driver =
-	ISA_DRIVER ( skel_isa_probe_addrs, skel_isa_probe_addr,
+ISA_DRIVER ( skel_isa_driver, skel_isa_probe_addrs, skel_isa_probe_addr,
 		     ISA_VENDOR('S','K','L'), 0x0000 );
 
 DRIVER ( "SKEL/ISA", nic_driver, isa_driver, skel_isa_driver,
diff --git a/src/drivers/net/smc9000.c b/src/drivers/net/smc9000.c
index c59d9d8e..7c694777 100644
--- a/src/drivers/net/smc9000.c
+++ b/src/drivers/net/smc9000.c
@@ -490,8 +490,7 @@ static isa_probe_addr_t smc9000_probe_addrs[] = {
    0x300, 0x320, 0x340, 0x360, 0x380, 0x3A0, 0x3C0, 0x3E0,
 };
 
-static struct isa_driver smc9000_driver =
-	ISA_DRIVER ( smc9000_probe_addrs, smc9000_probe_addr,
+ISA_DRIVER ( smc9000_driver, smc9000_probe_addrs, smc9000_probe_addr,
 		     GENERIC_ISAPNP_VENDOR, 0x8228 );
 
 DRIVER ( "SMC9000", nic_driver, isa_driver, smc9000_driver,
diff --git a/src/drivers/net/sundance.c b/src/drivers/net/sundance.c
index 4f2adf2a..3195cb8b 100644
--- a/src/drivers/net/sundance.c
+++ b/src/drivers/net/sundance.c
@@ -884,8 +884,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 ( sundance_nics, PCI_NO_CLASS );
+PCI_DRIVER ( sundance_driver, sundance_nics, PCI_NO_CLASS );
 
 DRIVER ( "SUNDANCE/PCI", nic_driver, pci_driver, sundance_driver,
 	 sundance_probe, sundance_disable );
diff --git a/src/drivers/net/tg3.c b/src/drivers/net/tg3.c
index d284bbf2..4cdd54e7 100644
--- a/src/drivers/net/tg3.c
+++ b/src/drivers/net/tg3.c
@@ -3384,8 +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 ( tg3_nics, PCI_NO_CLASS );
+PCI_DRIVER ( tg3_driver, tg3_nics, PCI_NO_CLASS );
 
 DRIVER ( "TG3", nic_driver, pci_driver, tg3_driver,
 	 tg3_probe, tg3_disable );
diff --git a/src/drivers/net/tlan.c b/src/drivers/net/tlan.c
index b2b34224..0f7ef198 100644
--- a/src/drivers/net/tlan.c
+++ b/src/drivers/net/tlan.c
@@ -1715,8 +1715,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 ( tlan_nics, PCI_NO_CLASS );
+PCI_DRIVER ( tlan_driver, tlan_nics, PCI_NO_CLASS );
 
 DRIVER ( "TLAN/PCI", nic_driver, pci_driver, tlan_driver,
 	 tlan_probe, tlan_disable );
diff --git a/src/drivers/net/tulip.c b/src/drivers/net/tulip.c
index e70ec19a..30df9870 100644
--- a/src/drivers/net/tulip.c
+++ b/src/drivers/net/tulip.c
@@ -2075,8 +2075,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 ( tulip_nics, PCI_NO_CLASS );
+PCI_DRIVER ( tulip_driver, tulip_nics, PCI_NO_CLASS );
 
 DRIVER ( "Tulip", nic_driver, pci_driver, tulip_driver,
 	 tulip_probe, tulip_disable );
diff --git a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c
index aef7cfa5..71fcfd61 100644
--- a/src/drivers/net/via-rhine.c
+++ b/src/drivers/net/via-rhine.c
@@ -1419,8 +1419,7 @@ PCI_ROM(0x1106, 0x3053, "via6105m",        "VIA 6105M"),
 PCI_ROM(0x1106, 0x6100, "via-rhine-old",   "VIA 86C100A"),	/* Rhine-II */
 };
 
-static struct pci_driver rhine_driver =
-	PCI_DRIVER ( rhine_nics, PCI_NO_CLASS );
+PCI_DRIVER ( rhine_driver, rhine_nics, PCI_NO_CLASS );
 
 DRIVER ( "VIA 86C100", nic_driver, pci_driver, rhine_driver,
 	 rhine_probe, rhine_disable );
diff --git a/src/drivers/net/w89c840.c b/src/drivers/net/w89c840.c
index 8863c764..e71a82da 100644
--- a/src/drivers/net/w89c840.c
+++ b/src/drivers/net/w89c840.c
@@ -618,8 +618,7 @@ PCI_ROM(0x1050, 0x0840, "winbond840",     "Winbond W89C840F"),
 PCI_ROM(0x11f6, 0x2011, "compexrl100atx", "Compex RL100ATX"),
 };
 
-static struct pci_driver w89c840_driver =
-	PCI_DRIVER ( w89c840_nics, PCI_NO_CLASS );
+PCI_DRIVER ( w89c840_driver, w89c840_nics, PCI_NO_CLASS );
 
 /**************************************************************************
 w89c840_probe - Look for an adapter, this routine's visible to the outside