[pci] Add driver_data field to struct pci_device_id

Modified-by: Michael Brown <mcb30@etherboot.org>
Signed-off-by: Michael Brown <mcb30@etherboot.org>

src/arch/i386/drivers/net/undi.c

@@ -135,7 +135,7 @@ static void undipci_remove ( struct pci_device *pci ) {
 }
 
 static struct pci_device_id undipci_nics[] = {
-PCI_ROM ( 0xffff, 0xffff, "undipci", "UNDI (PCI)" ),
+PCI_ROM ( 0xffff, 0xffff, "undipci", "UNDI (PCI)", 0 ),
 };
 
 struct pci_driver undipci_driver __pci_driver = {

src/drivers/infiniband/arbel.c

@@ -2241,8 +2241,8 @@ static void arbel_remove ( struct pci_device *pci ) {
 }
 
 static struct pci_device_id arbel_nics[] = {
-	PCI_ROM ( 0x15b3, 0x6282, "mt25218", "MT25218 HCA driver" ),
-	PCI_ROM ( 0x15b3, 0x6274, "mt25204", "MT25204 HCA driver" ),
+	PCI_ROM ( 0x15b3, 0x6282, "mt25218", "MT25218 HCA driver", 0 ),
+	PCI_ROM ( 0x15b3, 0x6274, "mt25204", "MT25204 HCA driver", 0 ),
 };
 
 struct pci_driver arbel_driver __pci_driver = {

src/drivers/infiniband/hermon.c

@@ -2310,10 +2310,10 @@ static void hermon_remove ( struct pci_device *pci ) {
 }
 
 static struct pci_device_id hermon_nics[] = {
-	PCI_ROM ( 0x15b3, 0x6340, "mt25408", "MT25408 HCA driver" ),
-	PCI_ROM ( 0x15b3, 0x634a, "mt25418", "MT25418 HCA driver" ),
-	PCI_ROM ( 0x15b3, 0x6732, "mt26418", "MT26418 HCA driver" ),
-	PCI_ROM ( 0x15b3, 0x673c, "mt26428", "MT26428 HCA driver" ),
+	PCI_ROM ( 0x15b3, 0x6340, "mt25408", "MT25408 HCA driver", 0 ),
+	PCI_ROM ( 0x15b3, 0x634a, "mt25418", "MT25418 HCA driver", 0 ),
+	PCI_ROM ( 0x15b3, 0x6732, "mt26418", "MT26418 HCA driver", 0 ),
+	PCI_ROM ( 0x15b3, 0x673c, "mt26428", "MT26428 HCA driver", 0 ),
 };
 
 struct pci_driver hermon_driver __pci_driver = {

src/drivers/infiniband/linda.c

@@ -2386,7 +2386,7 @@ static void linda_remove ( struct pci_device *pci ) {
 }
 
 static struct pci_device_id linda_nics[] = {
-	PCI_ROM ( 0x1077, 0x7220, "iba7220", "QLE7240/7280 HCA driver" ),
+	PCI_ROM ( 0x1077, 0x7220, "iba7220", "QLE7240/7280 HCA driver", 0 ),
 };
 
 struct pci_driver linda_driver __pci_driver = {

src/drivers/net/3c595.c

@@ -521,20 +521,20 @@ static struct nic_operations t595_operations = {
 };
 
 static struct pci_device_id t595_nics[] = {
-PCI_ROM(0x10b7, 0x5900, "3c590",           "3Com590"),		/* Vortex 10Mbps */
-PCI_ROM(0x10b7, 0x5950, "3c595",           "3Com595"),		/* Vortex 100baseTx */
-PCI_ROM(0x10b7, 0x5951, "3c595-1",         "3Com595"),		/* Vortex 100baseT4 */
-PCI_ROM(0x10b7, 0x5952, "3c595-2",         "3Com595"),		/* Vortex 100base-MII */
-PCI_ROM(0x10b7, 0x9000, "3c900-tpo",       "3Com900-TPO"),	/* 10 Base TPO */
-PCI_ROM(0x10b7, 0x9001, "3c900-t4",        "3Com900-Combo"),	/* 10/100 T4 */
-PCI_ROM(0x10b7, 0x9004, "3c900b-tpo",      "3Com900B-TPO"),	/* 10 Base TPO */
-PCI_ROM(0x10b7, 0x9005, "3c900b-combo",    "3Com900B-Combo"),	/* 10 Base Combo */
-PCI_ROM(0x10b7, 0x9006, "3c900b-tpb2",     "3Com900B-2/T"),	/* 10 Base TP and Base2 */
-PCI_ROM(0x10b7, 0x900a, "3c900b-fl",       "3Com900B-FL"),	/* 10 Base F */
-PCI_ROM(0x10b7, 0x9800, "3c980-cyclone-1", "3Com980-Cyclone"),	/* Cyclone */
-PCI_ROM(0x10b7, 0x9805, "3c9805-1",        "3Com9805"),		/* Dual Port Server Cyclone */
-PCI_ROM(0x10b7, 0x7646, "3csoho100-tx-1",  "3CSOHO100-TX"),	/* Hurricane */
-PCI_ROM(0x10b7, 0x4500, "3c450-1",         "3Com450 HomePNA Tornado"),
+PCI_ROM(0x10b7, 0x5900, "3c590",           "3Com590", 0),		/* Vortex 10Mbps */
+PCI_ROM(0x10b7, 0x5950, "3c595",           "3Com595", 0),		/* Vortex 100baseTx */
+PCI_ROM(0x10b7, 0x5951, "3c595-1",         "3Com595", 0),		/* Vortex 100baseT4 */
+PCI_ROM(0x10b7, 0x5952, "3c595-2",         "3Com595", 0),		/* Vortex 100base-MII */
+PCI_ROM(0x10b7, 0x9000, "3c900-tpo",       "3Com900-TPO", 0),	/* 10 Base TPO */
+PCI_ROM(0x10b7, 0x9001, "3c900-t4",        "3Com900-Combo", 0),	/* 10/100 T4 */
+PCI_ROM(0x10b7, 0x9004, "3c900b-tpo",      "3Com900B-TPO", 0),	/* 10 Base TPO */
+PCI_ROM(0x10b7, 0x9005, "3c900b-combo",    "3Com900B-Combo", 0),	/* 10 Base Combo */
+PCI_ROM(0x10b7, 0x9006, "3c900b-tpb2",     "3Com900B-2/T", 0),	/* 10 Base TP and Base2 */
+PCI_ROM(0x10b7, 0x900a, "3c900b-fl",       "3Com900B-FL", 0),	/* 10 Base F */
+PCI_ROM(0x10b7, 0x9800, "3c980-cyclone-1", "3Com980-Cyclone", 0),	/* Cyclone */
+PCI_ROM(0x10b7, 0x9805, "3c9805-1",        "3Com9805", 0),		/* Dual Port Server Cyclone */
+PCI_ROM(0x10b7, 0x7646, "3csoho100-tx-1",  "3CSOHO100-TX", 0),	/* Hurricane */
+PCI_ROM(0x10b7, 0x4500, "3c450-1",         "3Com450 HomePNA Tornado", 0),
 };
 
 PCI_DRIVER ( t595_driver, t595_nics, PCI_NO_CLASS );

src/drivers/net/3c90x.c

@@ -950,30 +950,30 @@ static int a3c90x_probe(struct pci_device *pci,
 
 static struct pci_device_id a3c90x_nics[] = {
 /* Original 90x revisions: */
-	PCI_ROM(0x10b7, 0x6055, "3c556", "3C556"),	/* Huricane */
-	PCI_ROM(0x10b7, 0x9000, "3c905-tpo", "3Com900-TPO"),	/* 10 Base TPO */
-	PCI_ROM(0x10b7, 0x9001, "3c905-t4", "3Com900-Combo"),	/* 10/100 T4 */
-	PCI_ROM(0x10b7, 0x9050, "3c905-tpo100", "3Com905-TX"),	/* 100 Base TX / 10/100 TPO */
-	PCI_ROM(0x10b7, 0x9051, "3c905-combo", "3Com905-T4"),	/* 100 Base T4 / 10 Base Combo */
+	PCI_ROM(0x10b7, 0x6055, "3c556", "3C556", 0),	/* Huricane */
+	PCI_ROM(0x10b7, 0x9000, "3c905-tpo", "3Com900-TPO", 0),	/* 10 Base TPO */
+	PCI_ROM(0x10b7, 0x9001, "3c905-t4", "3Com900-Combo", 0),	/* 10/100 T4 */
+	PCI_ROM(0x10b7, 0x9050, "3c905-tpo100", "3Com905-TX", 0),	/* 100 Base TX / 10/100 TPO */
+	PCI_ROM(0x10b7, 0x9051, "3c905-combo", "3Com905-T4", 0),	/* 100 Base T4 / 10 Base Combo */
 /* Newer 90xB revisions: */
-	PCI_ROM(0x10b7, 0x9004, "3c905b-tpo", "3Com900B-TPO"),	/* 10 Base TPO */
-	PCI_ROM(0x10b7, 0x9005, "3c905b-combo", "3Com900B-Combo"),	/* 10 Base Combo */
-	PCI_ROM(0x10b7, 0x9006, "3c905b-tpb2", "3Com900B-2/T"),	/* 10 Base TP and Base2 */
-	PCI_ROM(0x10b7, 0x900a, "3c905b-fl", "3Com900B-FL"),	/* 10 Base FL */
-	PCI_ROM(0x10b7, 0x9055, "3c905b-tpo100", "3Com905B-TX"),	/* 10/100 TPO */
-	PCI_ROM(0x10b7, 0x9056, "3c905b-t4", "3Com905B-T4"),	/* 10/100 T4 */
-	PCI_ROM(0x10b7, 0x9058, "3c905b-9058", "3Com905B-9058"),	/* Cyclone 10/100/BNC */
-	PCI_ROM(0x10b7, 0x905a, "3c905b-fx", "3Com905B-FL"),	/* 100 Base FX / 10 Base FX */
+	PCI_ROM(0x10b7, 0x9004, "3c905b-tpo", "3Com900B-TPO", 0),	/* 10 Base TPO */
+	PCI_ROM(0x10b7, 0x9005, "3c905b-combo", "3Com900B-Combo", 0),	/* 10 Base Combo */
+	PCI_ROM(0x10b7, 0x9006, "3c905b-tpb2", "3Com900B-2/T", 0),	/* 10 Base TP and Base2 */
+	PCI_ROM(0x10b7, 0x900a, "3c905b-fl", "3Com900B-FL", 0),	/* 10 Base FL */
+	PCI_ROM(0x10b7, 0x9055, "3c905b-tpo100", "3Com905B-TX", 0),	/* 10/100 TPO */
+	PCI_ROM(0x10b7, 0x9056, "3c905b-t4", "3Com905B-T4", 0),	/* 10/100 T4 */
+	PCI_ROM(0x10b7, 0x9058, "3c905b-9058", "3Com905B-9058", 0),	/* Cyclone 10/100/BNC */
+	PCI_ROM(0x10b7, 0x905a, "3c905b-fx", "3Com905B-FL", 0),	/* 100 Base FX / 10 Base FX */
 /* Newer 90xC revision: */
-	PCI_ROM(0x10b7, 0x9200, "3c905c-tpo", "3Com905C-TXM"),	/* 10/100 TPO (3C905C-TXM) */
-	PCI_ROM(0x10b7, 0x9202, "3c920b-emb-ati", "3c920B-EMB-WNM (ATI Radeon 9100 IGP)"),	/* 3c920B-EMB-WNM (ATI Radeon 9100 IGP) */
-	PCI_ROM(0x10b7, 0x9210, "3c920b-emb-wnm", "3Com20B-EMB WNM"),
-	PCI_ROM(0x10b7, 0x9800, "3c980", "3Com980-Cyclone"),	/* Cyclone */
-	PCI_ROM(0x10b7, 0x9805, "3c9805", "3Com9805"),	/* Dual Port Server Cyclone */
-	PCI_ROM(0x10b7, 0x7646, "3csoho100-tx", "3CSOHO100-TX"),	/* Hurricane */
-	PCI_ROM(0x10b7, 0x4500, "3c450", "3Com450 HomePNA Tornado"),
-	PCI_ROM(0x10b7, 0x1201, "3c982a", "3Com982A"),
-	PCI_ROM(0x10b7, 0x1202, "3c982b", "3Com982B"),
+	PCI_ROM(0x10b7, 0x9200, "3c905c-tpo", "3Com905C-TXM", 0),	/* 10/100 TPO (3C905C-TXM) */
+	PCI_ROM(0x10b7, 0x9202, "3c920b-emb-ati", "3c920B-EMB-WNM (ATI Radeon 9100 IGP)", 0),	/* 3c920B-EMB-WNM (ATI Radeon 9100 IGP) */
+	PCI_ROM(0x10b7, 0x9210, "3c920b-emb-wnm", "3Com20B-EMB WNM", 0),
+	PCI_ROM(0x10b7, 0x9800, "3c980", "3Com980-Cyclone", 0),	/* Cyclone */
+	PCI_ROM(0x10b7, 0x9805, "3c9805", "3Com9805", 0),	/* Dual Port Server Cyclone */
+	PCI_ROM(0x10b7, 0x7646, "3csoho100-tx", "3CSOHO100-TX", 0),	/* Hurricane */
+	PCI_ROM(0x10b7, 0x4500, "3c450", "3Com450 HomePNA Tornado", 0),
+	PCI_ROM(0x10b7, 0x1201, "3c982a", "3Com982A", 0),
+	PCI_ROM(0x10b7, 0x1202, "3c982b", "3Com982B", 0),
 };
 
 struct pci_driver a3c90x_driver __pci_driver = {

src/drivers/net/amd8111e.c

@@ -674,7 +674,7 @@ static int amd8111e_probe(struct nic *nic, struct pci_device *pdev)
 }
 
 static struct pci_device_id amd8111e_nics[] = {
-	PCI_ROM(0x1022, 0x7462, "amd8111e",	"AMD8111E"),
+	PCI_ROM(0x1022, 0x7462, "amd8111e",	"AMD8111E", 0),
 };
 
 PCI_DRIVER ( amd8111e_driver, amd8111e_nics, PCI_NO_CLASS );

src/drivers/net/b44.c

@@ -935,9 +935,9 @@ static struct net_device_operations b44_operations = {
 
 
 static struct pci_device_id b44_nics[] = {
-	PCI_ROM(0x14e4, 0x4401, "BCM4401", "BCM4401"),
-	PCI_ROM(0x14e4, 0x170c, "BCM4401-B0", "BCM4401-B0"),
-	PCI_ROM(0x14e4, 0x4402, "BCM4401-B1", "BCM4401-B1"),
+	PCI_ROM(0x14e4, 0x4401, "BCM4401", "BCM4401", 0),
+	PCI_ROM(0x14e4, 0x170c, "BCM4401-B0", "BCM4401-B0", 0),
+	PCI_ROM(0x14e4, 0x4402, "BCM4401-B1", "BCM4401-B1", 0),
 };
 
 

src/drivers/net/bnx2.c

@@ -2673,10 +2673,10 @@ err_out_disable:
 }
 
 static struct pci_device_id bnx2_nics[] = {
-	PCI_ROM(0x14e4, 0x164a, "bnx2-5706",        "Broadcom NetXtreme II BCM5706"),
-	PCI_ROM(0x14e4, 0x164c, "bnx2-5708",        "Broadcom NetXtreme II BCM5708"),
-	PCI_ROM(0x14e4, 0x16aa, "bnx2-5706S",       "Broadcom NetXtreme II BCM5706S"),
-	PCI_ROM(0x14e4, 0x16ac, "bnx2-5708S",       "Broadcom NetXtreme II BCM5708S"),
+	PCI_ROM(0x14e4, 0x164a, "bnx2-5706",        "Broadcom NetXtreme II BCM5706", 0),
+	PCI_ROM(0x14e4, 0x164c, "bnx2-5708",        "Broadcom NetXtreme II BCM5708", 0),
+	PCI_ROM(0x14e4, 0x16aa, "bnx2-5706S",       "Broadcom NetXtreme II BCM5706S", 0),
+	PCI_ROM(0x14e4, 0x16ac, "bnx2-5708S",       "Broadcom NetXtreme II BCM5708S", 0),
 };
 
 PCI_DRIVER ( bnx2_driver, bnx2_nics, PCI_NO_CLASS );

src/drivers/net/davicom.c

@@ -705,10 +705,10 @@ static struct nic_operations davicom_operations = {
 };
 
 static struct pci_device_id davicom_nics[] = {
-PCI_ROM(0x1282, 0x9100, "davicom9100", "Davicom 9100"),
-PCI_ROM(0x1282, 0x9102, "davicom9102", "Davicom 9102"),
-PCI_ROM(0x1282, 0x9009, "davicom9009", "Davicom 9009"),
-PCI_ROM(0x1282, 0x9132, "davicom9132", "Davicom 9132"),	/* Needs probably some fixing */
+PCI_ROM(0x1282, 0x9100, "davicom9100", "Davicom 9100", 0),
+PCI_ROM(0x1282, 0x9102, "davicom9102", "Davicom 9102", 0),
+PCI_ROM(0x1282, 0x9009, "davicom9009", "Davicom 9009", 0),
+PCI_ROM(0x1282, 0x9132, "davicom9132", "Davicom 9132", 0),	/* Needs probably some fixing */
 };
 
 PCI_DRIVER ( davicom_driver, davicom_nics, PCI_NO_CLASS );

src/drivers/net/dmfe.c

@@ -1204,10 +1204,10 @@ static struct nic_operations dmfe_operations = {
 };
 
 static struct pci_device_id dmfe_nics[] = {
-	PCI_ROM(0x1282, 0x9100, "dmfe9100", "Davicom 9100"),
-	PCI_ROM(0x1282, 0x9102, "dmfe9102", "Davicom 9102"),
-	PCI_ROM(0x1282, 0x9009, "dmfe9009", "Davicom 9009"),
-	PCI_ROM(0x1282, 0x9132, "dmfe9132", "Davicom 9132"),	/* Needs probably some fixing */
+	PCI_ROM(0x1282, 0x9100, "dmfe9100", "Davicom 9100", 0),
+	PCI_ROM(0x1282, 0x9102, "dmfe9102", "Davicom 9102", 0),
+	PCI_ROM(0x1282, 0x9009, "dmfe9009", "Davicom 9009", 0),
+	PCI_ROM(0x1282, 0x9132, "dmfe9132", "Davicom 9132", 0),	/* Needs probably some fixing */
 };
 
 PCI_DRIVER ( dmfe_driver, dmfe_nics, PCI_NO_CLASS );

src/drivers/net/e1000/e1000.c

@@ -1039,68 +1039,68 @@ e1000_io_write ( struct e1000_hw *hw  __unused, unsigned long port, uint32_t val
 }
 
 static struct pci_device_id e1000_nics[] = {
-	PCI_ROM(0x8086, 0x1000, "e1000-0x1000", "e1000-0x1000"),
-	PCI_ROM(0x8086, 0x1001, "e1000-0x1001", "e1000-0x1001"),
-	PCI_ROM(0x8086, 0x1004, "e1000-0x1004", "e1000-0x1004"),
-	PCI_ROM(0x8086, 0x1008, "e1000-0x1008", "e1000-0x1008"),
-	PCI_ROM(0x8086, 0x1009, "e1000-0x1009", "e1000-0x1009"),
-	PCI_ROM(0x8086, 0x100c, "e1000-0x100c", "e1000-0x100c"),
-	PCI_ROM(0x8086, 0x100d, "e1000-0x100d", "e1000-0x100d"),
-	PCI_ROM(0x8086, 0x100e, "e1000-0x100e", "e1000-0x100e"),
-	PCI_ROM(0x8086, 0x100f, "e1000-0x100f", "e1000-0x100f"),
-	PCI_ROM(0x8086, 0x1010, "e1000-0x1010", "e1000-0x1010"),
-	PCI_ROM(0x8086, 0x1011, "e1000-0x1011", "e1000-0x1011"),
-	PCI_ROM(0x8086, 0x1012, "e1000-0x1012", "e1000-0x1012"),
-	PCI_ROM(0x8086, 0x1013, "e1000-0x1013", "e1000-0x1013"),
-	PCI_ROM(0x8086, 0x1014, "e1000-0x1014", "e1000-0x1014"),
-	PCI_ROM(0x8086, 0x1015, "e1000-0x1015", "e1000-0x1015"),
-	PCI_ROM(0x8086, 0x1016, "e1000-0x1016", "e1000-0x1016"),
-	PCI_ROM(0x8086, 0x1017, "e1000-0x1017", "e1000-0x1017"),
-	PCI_ROM(0x8086, 0x1018, "e1000-0x1018", "e1000-0x1018"),
-	PCI_ROM(0x8086, 0x1019, "e1000-0x1019", "e1000-0x1019"),
-	PCI_ROM(0x8086, 0x101a, "e1000-0x101a", "e1000-0x101a"),
-	PCI_ROM(0x8086, 0x101d, "e1000-0x101d", "e1000-0x101d"),
-	PCI_ROM(0x8086, 0x101e, "e1000-0x101e", "e1000-0x101e"),
-	PCI_ROM(0x8086, 0x1026, "e1000-0x1026", "e1000-0x1026"),
-	PCI_ROM(0x8086, 0x1027, "e1000-0x1027", "e1000-0x1027"),
-	PCI_ROM(0x8086, 0x1028, "e1000-0x1028", "e1000-0x1028"),
-	PCI_ROM(0x8086, 0x1049, "e1000-0x1049", "e1000-0x1049"),
-	PCI_ROM(0x8086, 0x104a, "e1000-0x104a", "e1000-0x104a"),
-	PCI_ROM(0x8086, 0x104b, "e1000-0x104b", "e1000-0x104b"),
-	PCI_ROM(0x8086, 0x104c, "e1000-0x104c", "e1000-0x104c"),
-	PCI_ROM(0x8086, 0x104d, "e1000-0x104d", "e1000-0x104d"),
-	PCI_ROM(0x8086, 0x105e, "e1000-0x105e", "e1000-0x105e"),
-	PCI_ROM(0x8086, 0x105f, "e1000-0x105f", "e1000-0x105f"),
-	PCI_ROM(0x8086, 0x1060, "e1000-0x1060", "e1000-0x1060"),
-	PCI_ROM(0x8086, 0x1075, "e1000-0x1075", "e1000-0x1075"),
-	PCI_ROM(0x8086, 0x1076, "e1000-0x1076", "e1000-0x1076"),
-	PCI_ROM(0x8086, 0x1077, "e1000-0x1077", "e1000-0x1077"),
-	PCI_ROM(0x8086, 0x1078, "e1000-0x1078", "e1000-0x1078"),
-	PCI_ROM(0x8086, 0x1079, "e1000-0x1079", "e1000-0x1079"),
-	PCI_ROM(0x8086, 0x107a, "e1000-0x107a", "e1000-0x107a"),
-	PCI_ROM(0x8086, 0x107b, "e1000-0x107b", "e1000-0x107b"),
-	PCI_ROM(0x8086, 0x107c, "e1000-0x107c", "e1000-0x107c"),
-	PCI_ROM(0x8086, 0x107d, "e1000-0x107d", "e1000-0x107d"),
-	PCI_ROM(0x8086, 0x107e, "e1000-0x107e", "e1000-0x107e"),
-	PCI_ROM(0x8086, 0x107f, "e1000-0x107f", "e1000-0x107f"),
-	PCI_ROM(0x8086, 0x108a, "e1000-0x108a", "e1000-0x108a"),
-	PCI_ROM(0x8086, 0x108b, "e1000-0x108b", "e1000-0x108b"),
-	PCI_ROM(0x8086, 0x108c, "e1000-0x108c", "e1000-0x108c"),
-	PCI_ROM(0x8086, 0x1096, "e1000-0x1096", "e1000-0x1096"),
-	PCI_ROM(0x8086, 0x1098, "e1000-0x1098", "e1000-0x1098"),
-	PCI_ROM(0x8086, 0x1099, "e1000-0x1099", "e1000-0x1099"),
-	PCI_ROM(0x8086, 0x109a, "e1000-0x109a", "e1000-0x109a"),
-	PCI_ROM(0x8086, 0x10a4, "e1000-0x10a4", "e1000-0x10a4"),
-	PCI_ROM(0x8086, 0x10a5, "e1000-0x10a5", "e1000-0x10a5"),
-	PCI_ROM(0x8086, 0x10b5, "e1000-0x10b5", "e1000-0x10b5"),
-	PCI_ROM(0x8086, 0x10b9, "e1000-0x10b9", "e1000-0x10b9"),
-	PCI_ROM(0x8086, 0x10ba, "e1000-0x10ba", "e1000-0x10ba"),
-	PCI_ROM(0x8086, 0x10bb, "e1000-0x10bb", "e1000-0x10bb"),
-	PCI_ROM(0x8086, 0x10bc, "e1000-0x10bc", "e1000-0x10bc"),
-	PCI_ROM(0x8086, 0x10c4, "e1000-0x10c4", "e1000-0x10c4"),
-	PCI_ROM(0x8086, 0x10c5, "e1000-0x10c5", "e1000-0x10c5"),
-	PCI_ROM(0x8086, 0x10d9, "e1000-0x10d9", "e1000-0x10d9"),
-	PCI_ROM(0x8086, 0x10da, "e1000-0x10da", "e1000-0x10da"),
+	PCI_ROM(0x8086, 0x1000, "e1000-0x1000", "e1000-0x1000", 0),
+	PCI_ROM(0x8086, 0x1001, "e1000-0x1001", "e1000-0x1001", 0),
+	PCI_ROM(0x8086, 0x1004, "e1000-0x1004", "e1000-0x1004", 0),
+	PCI_ROM(0x8086, 0x1008, "e1000-0x1008", "e1000-0x1008", 0),
+	PCI_ROM(0x8086, 0x1009, "e1000-0x1009", "e1000-0x1009", 0),
+	PCI_ROM(0x8086, 0x100c, "e1000-0x100c", "e1000-0x100c", 0),
+	PCI_ROM(0x8086, 0x100d, "e1000-0x100d", "e1000-0x100d", 0),
+	PCI_ROM(0x8086, 0x100e, "e1000-0x100e", "e1000-0x100e", 0),
+	PCI_ROM(0x8086, 0x100f, "e1000-0x100f", "e1000-0x100f", 0),
+	PCI_ROM(0x8086, 0x1010, "e1000-0x1010", "e1000-0x1010", 0),
+	PCI_ROM(0x8086, 0x1011, "e1000-0x1011", "e1000-0x1011", 0),
+	PCI_ROM(0x8086, 0x1012, "e1000-0x1012", "e1000-0x1012", 0),
+	PCI_ROM(0x8086, 0x1013, "e1000-0x1013", "e1000-0x1013", 0),
+	PCI_ROM(0x8086, 0x1014, "e1000-0x1014", "e1000-0x1014", 0),
+	PCI_ROM(0x8086, 0x1015, "e1000-0x1015", "e1000-0x1015", 0),
+	PCI_ROM(0x8086, 0x1016, "e1000-0x1016", "e1000-0x1016", 0),
+	PCI_ROM(0x8086, 0x1017, "e1000-0x1017", "e1000-0x1017", 0),
+	PCI_ROM(0x8086, 0x1018, "e1000-0x1018", "e1000-0x1018", 0),
+	PCI_ROM(0x8086, 0x1019, "e1000-0x1019", "e1000-0x1019", 0),
+	PCI_ROM(0x8086, 0x101a, "e1000-0x101a", "e1000-0x101a", 0),
+	PCI_ROM(0x8086, 0x101d, "e1000-0x101d", "e1000-0x101d", 0),
+	PCI_ROM(0x8086, 0x101e, "e1000-0x101e", "e1000-0x101e", 0),
+	PCI_ROM(0x8086, 0x1026, "e1000-0x1026", "e1000-0x1026", 0),
+	PCI_ROM(0x8086, 0x1027, "e1000-0x1027", "e1000-0x1027", 0),
+	PCI_ROM(0x8086, 0x1028, "e1000-0x1028", "e1000-0x1028", 0),
+	PCI_ROM(0x8086, 0x1049, "e1000-0x1049", "e1000-0x1049", 0),
+	PCI_ROM(0x8086, 0x104a, "e1000-0x104a", "e1000-0x104a", 0),
+	PCI_ROM(0x8086, 0x104b, "e1000-0x104b", "e1000-0x104b", 0),
+	PCI_ROM(0x8086, 0x104c, "e1000-0x104c", "e1000-0x104c", 0),
+	PCI_ROM(0x8086, 0x104d, "e1000-0x104d", "e1000-0x104d", 0),
+	PCI_ROM(0x8086, 0x105e, "e1000-0x105e", "e1000-0x105e", 0),
+	PCI_ROM(0x8086, 0x105f, "e1000-0x105f", "e1000-0x105f", 0),
+	PCI_ROM(0x8086, 0x1060, "e1000-0x1060", "e1000-0x1060", 0),
+	PCI_ROM(0x8086, 0x1075, "e1000-0x1075", "e1000-0x1075", 0),
+	PCI_ROM(0x8086, 0x1076, "e1000-0x1076", "e1000-0x1076", 0),
+	PCI_ROM(0x8086, 0x1077, "e1000-0x1077", "e1000-0x1077", 0),
+	PCI_ROM(0x8086, 0x1078, "e1000-0x1078", "e1000-0x1078", 0),
+	PCI_ROM(0x8086, 0x1079, "e1000-0x1079", "e1000-0x1079", 0),
+	PCI_ROM(0x8086, 0x107a, "e1000-0x107a", "e1000-0x107a", 0),
+	PCI_ROM(0x8086, 0x107b, "e1000-0x107b", "e1000-0x107b", 0),
+	PCI_ROM(0x8086, 0x107c, "e1000-0x107c", "e1000-0x107c", 0),
+	PCI_ROM(0x8086, 0x107d, "e1000-0x107d", "e1000-0x107d", 0),
+	PCI_ROM(0x8086, 0x107e, "e1000-0x107e", "e1000-0x107e", 0),
+	PCI_ROM(0x8086, 0x107f, "e1000-0x107f", "e1000-0x107f", 0),
+	PCI_ROM(0x8086, 0x108a, "e1000-0x108a", "e1000-0x108a", 0),
+	PCI_ROM(0x8086, 0x108b, "e1000-0x108b", "e1000-0x108b", 0),
+	PCI_ROM(0x8086, 0x108c, "e1000-0x108c", "e1000-0x108c", 0),
+	PCI_ROM(0x8086, 0x1096, "e1000-0x1096", "e1000-0x1096", 0),
+	PCI_ROM(0x8086, 0x1098, "e1000-0x1098", "e1000-0x1098", 0),
+	PCI_ROM(0x8086, 0x1099, "e1000-0x1099", "e1000-0x1099", 0),
+	PCI_ROM(0x8086, 0x109a, "e1000-0x109a", "e1000-0x109a", 0),
+	PCI_ROM(0x8086, 0x10a4, "e1000-0x10a4", "e1000-0x10a4", 0),
+	PCI_ROM(0x8086, 0x10a5, "e1000-0x10a5", "e1000-0x10a5", 0),
+	PCI_ROM(0x8086, 0x10b5, "e1000-0x10b5", "e1000-0x10b5", 0),
+	PCI_ROM(0x8086, 0x10b9, "e1000-0x10b9", "e1000-0x10b9", 0),
+	PCI_ROM(0x8086, 0x10ba, "e1000-0x10ba", "e1000-0x10ba", 0),
+	PCI_ROM(0x8086, 0x10bb, "e1000-0x10bb", "e1000-0x10bb", 0),
+	PCI_ROM(0x8086, 0x10bc, "e1000-0x10bc", "e1000-0x10bc", 0),
+	PCI_ROM(0x8086, 0x10c4, "e1000-0x10c4", "e1000-0x10c4", 0),
+	PCI_ROM(0x8086, 0x10c5, "e1000-0x10c5", "e1000-0x10c5", 0),
+	PCI_ROM(0x8086, 0x10d9, "e1000-0x10d9", "e1000-0x10d9", 0),
+	PCI_ROM(0x8086, 0x10da, "e1000-0x10da", "e1000-0x10da", 0),
 };
 
 struct pci_driver e1000_driver __pci_driver = {

src/drivers/net/eepro100.c

@@ -800,36 +800,36 @@ static struct nic_operations eepro100_operations = {
 };
 
 static struct pci_device_id eepro100_nics[] = {
-PCI_ROM(0x8086, 0x1029, "id1029",        "Intel EtherExpressPro100 ID1029"),
-PCI_ROM(0x8086, 0x1030, "id1030",        "Intel EtherExpressPro100 ID1030"),
-PCI_ROM(0x8086, 0x1031, "82801cam",      "Intel 82801CAM (ICH3) Chipset Ethernet Controller"),
-PCI_ROM(0x8086, 0x1032, "eepro100-1032", "Intel PRO/100 VE Network Connection"),
-PCI_ROM(0x8086, 0x1033, "eepro100-1033", "Intel PRO/100 VM Network Connection"),
-PCI_ROM(0x8086, 0x1034, "eepro100-1034", "Intel PRO/100 VM Network Connection"),
-PCI_ROM(0x8086, 0x1035, "eepro100-1035", "Intel 82801CAM (ICH3) Chipset Ethernet Controller"),
-PCI_ROM(0x8086, 0x1036, "eepro100-1036", "Intel 82801CAM (ICH3) Chipset Ethernet Controller"),
-PCI_ROM(0x8086, 0x1037, "eepro100-1037", "Intel 82801CAM (ICH3) Chipset Ethernet Controller"),
-PCI_ROM(0x8086, 0x1038, "id1038",        "Intel PRO/100 VM Network Connection"),
-PCI_ROM(0x8086, 0x1039, "82562et",       "Intel PRO100 VE 82562ET"),
-PCI_ROM(0x8086, 0x103a, "id103a",        "Intel Corporation 82559 InBusiness 10/100"),
-PCI_ROM(0x8086, 0x103b, "82562etb",      "Intel PRO100 VE 82562ETB"),
-PCI_ROM(0x8086, 0x103c, "eepro100-103c", "Intel PRO/100 VM Network Connection"),
-PCI_ROM(0x8086, 0x103d, "eepro100-103d", "Intel PRO/100 VE Network Connection"),
-PCI_ROM(0x8086, 0x103e, "eepro100-103e", "Intel PRO/100 VM Network Connection"),
-PCI_ROM(0x8086, 0x1051, "prove",       "Intel PRO/100 VE Network Connection"),
-PCI_ROM(0x8086, 0x1059, "82551qm",       "Intel PRO/100 M Mobile Connection"),
-PCI_ROM(0x8086, 0x1209, "82559er",       "Intel EtherExpressPro100 82559ER"),
-PCI_ROM(0x8086, 0x1227, "82865",         "Intel 82865 EtherExpress PRO/100A"),
-PCI_ROM(0x8086, 0x1228, "82556",         "Intel 82556 EtherExpress PRO/100 Smart"),
-PCI_ROM(0x8086, 0x1229, "eepro100",      "Intel EtherExpressPro100"),
-PCI_ROM(0x8086, 0x2449, "82562em",       "Intel EtherExpressPro100 82562EM"),
-PCI_ROM(0x8086, 0x2459, "82562-1",       "Intel 82562 based Fast Ethernet Connection"),
-PCI_ROM(0x8086, 0x245d, "82562-2",       "Intel 82562 based Fast Ethernet Connection"),
-PCI_ROM(0x8086, 0x1050, "82562ez",       "Intel 82562EZ Network Connection"),
-PCI_ROM(0x8086, 0x1051, "eepro100-1051", "Intel 82801EB/ER (ICH5/ICH5R) Chipset Ethernet Controller"),
-PCI_ROM(0x8086, 0x1065, "82562-3",       "Intel 82562 based Fast Ethernet Connection"),
-PCI_ROM(0x8086, 0x5200, "eepro100-5200", "Intel EtherExpress PRO/100 Intelligent Server"),
-PCI_ROM(0x8086, 0x5201, "eepro100-5201", "Intel EtherExpress PRO/100 Intelligent Server"),
+PCI_ROM(0x8086, 0x1029, "id1029",        "Intel EtherExpressPro100 ID1029", 0),
+PCI_ROM(0x8086, 0x1030, "id1030",        "Intel EtherExpressPro100 ID1030", 0),
+PCI_ROM(0x8086, 0x1031, "82801cam",      "Intel 82801CAM (ICH3) Chipset Ethernet Controller", 0),
+PCI_ROM(0x8086, 0x1032, "eepro100-1032", "Intel PRO/100 VE Network Connection", 0),
+PCI_ROM(0x8086, 0x1033, "eepro100-1033", "Intel PRO/100 VM Network Connection", 0),
+PCI_ROM(0x8086, 0x1034, "eepro100-1034", "Intel PRO/100 VM Network Connection", 0),
+PCI_ROM(0x8086, 0x1035, "eepro100-1035", "Intel 82801CAM (ICH3) Chipset Ethernet Controller", 0),
+PCI_ROM(0x8086, 0x1036, "eepro100-1036", "Intel 82801CAM (ICH3) Chipset Ethernet Controller", 0),
+PCI_ROM(0x8086, 0x1037, "eepro100-1037", "Intel 82801CAM (ICH3) Chipset Ethernet Controller", 0),
+PCI_ROM(0x8086, 0x1038, "id1038",        "Intel PRO/100 VM Network Connection", 0),
+PCI_ROM(0x8086, 0x1039, "82562et",       "Intel PRO100 VE 82562ET", 0),
+PCI_ROM(0x8086, 0x103a, "id103a",        "Intel Corporation 82559 InBusiness 10/100", 0),
+PCI_ROM(0x8086, 0x103b, "82562etb",      "Intel PRO100 VE 82562ETB", 0),
+PCI_ROM(0x8086, 0x103c, "eepro100-103c", "Intel PRO/100 VM Network Connection", 0),
+PCI_ROM(0x8086, 0x103d, "eepro100-103d", "Intel PRO/100 VE Network Connection", 0),
+PCI_ROM(0x8086, 0x103e, "eepro100-103e", "Intel PRO/100 VM Network Connection", 0),
+PCI_ROM(0x8086, 0x1051, "prove",       "Intel PRO/100 VE Network Connection", 0),
+PCI_ROM(0x8086, 0x1059, "82551qm",       "Intel PRO/100 M Mobile Connection", 0),
+PCI_ROM(0x8086, 0x1209, "82559er",       "Intel EtherExpressPro100 82559ER", 0),
+PCI_ROM(0x8086, 0x1227, "82865",         "Intel 82865 EtherExpress PRO/100A", 0),
+PCI_ROM(0x8086, 0x1228, "82556",         "Intel 82556 EtherExpress PRO/100 Smart", 0),
+PCI_ROM(0x8086, 0x1229, "eepro100",      "Intel EtherExpressPro100", 0),
+PCI_ROM(0x8086, 0x2449, "82562em",       "Intel EtherExpressPro100 82562EM", 0),
+PCI_ROM(0x8086, 0x2459, "82562-1",       "Intel 82562 based Fast Ethernet Connection", 0),
+PCI_ROM(0x8086, 0x245d, "82562-2",       "Intel 82562 based Fast Ethernet Connection", 0),
+PCI_ROM(0x8086, 0x1050, "82562ez",       "Intel 82562EZ Network Connection", 0),
+PCI_ROM(0x8086, 0x1051, "eepro100-1051", "Intel 82801EB/ER (ICH5/ICH5R) Chipset Ethernet Controller", 0),
+PCI_ROM(0x8086, 0x1065, "82562-3",       "Intel 82562 based Fast Ethernet Connection", 0),
+PCI_ROM(0x8086, 0x5200, "eepro100-5200", "Intel EtherExpress PRO/100 Intelligent Server", 0),
+PCI_ROM(0x8086, 0x5201, "eepro100-5201", "Intel EtherExpress PRO/100 Intelligent Server", 0),
 };
 
 /* Cards with device ids 0x1030 to 0x103F, 0x2449, 0x2459 or 0x245D might need

src/drivers/net/epic100.c

@@ -519,8 +519,8 @@ static struct nic_operations epic100_operations = {
 };
 
 static struct pci_device_id epic100_nics[] = {
-PCI_ROM(0x10b8, 0x0005, "epic100",    "SMC EtherPowerII"),		/* SMC 83c170 EPIC/100 */
-PCI_ROM(0x10b8, 0x0006, "smc-83c175", "SMC EPIC/C 83c175"),
+PCI_ROM(0x10b8, 0x0005, "epic100",    "SMC EtherPowerII", 0),		/* SMC 83c170 EPIC/100 */
+PCI_ROM(0x10b8, 0x0006, "smc-83c175", "SMC EPIC/C 83c175", 0),
 };
 
 PCI_DRIVER ( epic100_driver, epic100_nics, PCI_NO_CLASS );

src/drivers/net/etherfabric.c

@@ -4228,8 +4228,8 @@ fail1:
 
 
 static struct pci_device_id efab_nics[] = {
-	PCI_ROM(0x1924, 0x0703, "falcon", "EtherFabric Falcon"),
-	PCI_ROM(0x1924, 0x0710, "falconb0", "EtherFabric FalconB0"),
+	PCI_ROM(0x1924, 0x0703, "falcon", "EtherFabric Falcon", 0),
+	PCI_ROM(0x1924, 0x0710, "falconb0", "EtherFabric FalconB0", 0),
 };
 
 struct pci_driver etherfabric_driver __pci_driver = {

src/drivers/net/forcedeth.c

@@ -1412,18 +1412,18 @@ static int forcedeth_probe ( struct nic *nic, struct pci_device *pci ) {
 }
 
 static struct pci_device_id forcedeth_nics[] = {
-PCI_ROM(0x10de, 0x01C3, "nforce", "nForce NVENET_1 Ethernet Controller"),
-PCI_ROM(0x10de, 0x0066, "nforce2", "nForce NVENET_2 Ethernet Controller"),
-PCI_ROM(0x10de, 0x00D6, "nforce3", "nForce NVENET_3 Ethernet Controller"),
-PCI_ROM(0x10de, 0x0086, "nforce4", "nForce NVENET_4 Ethernet Controller"),
-PCI_ROM(0x10de, 0x008c, "nforce5", "nForce NVENET_5 Ethernet Controller"),
-PCI_ROM(0x10de, 0x00e6, "nforce6", "nForce NVENET_6 Ethernet Controller"),
-PCI_ROM(0x10de, 0x00df, "nforce7", "nForce NVENET_7 Ethernet Controller"),
-PCI_ROM(0x10de, 0x0056, "nforce8", "nForce NVENET_8 Ethernet Controller"),
-PCI_ROM(0x10de, 0x0057, "nforce9", "nForce NVENET_9 Ethernet Controller"),
-PCI_ROM(0x10de, 0x0037, "nforce10", "nForce NVENET_10 Ethernet Controller"),
-PCI_ROM(0x10de, 0x0038, "nforce11", "nForce NVENET_11 Ethernet Controller"),
-PCI_ROM(0x10de, 0x0373, "nforce15", "nForce NVENET_15 Ethernet Controller")
+PCI_ROM(0x10de, 0x01C3, "nforce", "nForce NVENET_1 Ethernet Controller", 0),
+PCI_ROM(0x10de, 0x0066, "nforce2", "nForce NVENET_2 Ethernet Controller", 0),
+PCI_ROM(0x10de, 0x00D6, "nforce3", "nForce NVENET_3 Ethernet Controller", 0),
+PCI_ROM(0x10de, 0x0086, "nforce4", "nForce NVENET_4 Ethernet Controller", 0),
+PCI_ROM(0x10de, 0x008c, "nforce5", "nForce NVENET_5 Ethernet Controller", 0),
+PCI_ROM(0x10de, 0x00e6, "nforce6", "nForce NVENET_6 Ethernet Controller", 0),
+PCI_ROM(0x10de, 0x00df, "nforce7", "nForce NVENET_7 Ethernet Controller", 0),
+PCI_ROM(0x10de, 0x0056, "nforce8", "nForce NVENET_8 Ethernet Controller", 0),
+PCI_ROM(0x10de, 0x0057, "nforce9", "nForce NVENET_9 Ethernet Controller", 0),
+PCI_ROM(0x10de, 0x0037, "nforce10", "nForce NVENET_10 Ethernet Controller", 0),
+PCI_ROM(0x10de, 0x0038, "nforce11", "nForce NVENET_11 Ethernet Controller", 0),
+PCI_ROM(0x10de, 0x0373, "nforce15", "nForce NVENET_15 Ethernet Controller", 0)
 };
 
 PCI_DRIVER ( forcedeth_driver, forcedeth_nics, PCI_NO_CLASS );

src/drivers/net/mtd80x.c

@@ -656,9 +656,9 @@ static struct nic_operations mtd_operations = {
 };
 
 static struct pci_device_id mtd80x_nics[] = {
-        PCI_ROM(0x1516, 0x0800, "MTD800", "Myson MTD800"),
-        PCI_ROM(0x1516, 0x0803, "MTD803", "Surecom EP-320X"),
-        PCI_ROM(0x1516, 0x0891, "MTD891", "Myson MTD891"),
+        PCI_ROM(0x1516, 0x0800, "MTD800", "Myson MTD800", 0),
+        PCI_ROM(0x1516, 0x0803, "MTD803", "Surecom EP-320X", 0),
+        PCI_ROM(0x1516, 0x0891, "MTD891", "Myson MTD891", 0),
 };
 
 PCI_DRIVER ( mtd80x_driver, mtd80x_nics, PCI_NO_CLASS );

src/drivers/net/mtnic.c

@@ -1835,10 +1835,10 @@ err_init_card:
 
 
 static struct pci_device_id mtnic_nics[] = {
-	PCI_ROM ( 0x15b3, 0x6368, "mt25448", "Mellanox ConnectX EN driver" ),
-	PCI_ROM ( 0x15b3, 0x6372, "mt25458", "Mellanox ConnectX ENt driver" ),
-	PCI_ROM ( 0x15b3, 0x6750, "mt26448", "Mellanox ConnectX EN GEN2 driver" ),
-	PCI_ROM ( 0x15b3, 0x675a, "mt26458", "Mellanox ConnectX ENt GEN2 driver" ),
+	PCI_ROM ( 0x15b3, 0x6368, "mt25448", "Mellanox ConnectX EN driver", 0 ),
+	PCI_ROM ( 0x15b3, 0x6372, "mt25458", "Mellanox ConnectX ENt driver", 0 ),
+	PCI_ROM ( 0x15b3, 0x6750, "mt26448", "Mellanox ConnectX EN GEN2 driver", 0 ),
+	PCI_ROM ( 0x15b3, 0x675a, "mt26458", "Mellanox ConnectX ENt GEN2 driver", 0 ),
 };
 
 struct pci_driver mtnic_driver __pci_driver = {

src/drivers/net/natsemi.c

@@ -596,7 +596,7 @@ static void natsemi_irq (struct net_device *netdev, int enable)
 }
 
 static struct pci_device_id natsemi_nics[] = {
-	PCI_ROM(0x100b, 0x0020, "dp83815", "DP83815"),
+	PCI_ROM(0x100b, 0x0020, "dp83815", "DP83815", 0),
 };
 
 struct pci_driver natsemi_driver __pci_driver = {

src/drivers/net/ns83820.c

@@ -802,7 +802,7 @@ static struct nic_operations ns83820_operations = {
 };
 
 static struct pci_device_id ns83820_nics[] = {
-	PCI_ROM(0x100b, 0x0022, "ns83820", "National Semiconductor 83820"),
+	PCI_ROM(0x100b, 0x0022, "ns83820", "National Semiconductor 83820", 0),
 };
 
 PCI_DRIVER ( ns83820_driver, ns83820_nics, PCI_NO_CLASS );

src/drivers/net/ns8390.c

@@ -1004,17 +1004,17 @@ ISA_ROM("ne","NE1000/2000 and clones");
 #ifdef	INCLUDE_NS8390
 static struct pci_device_id nepci_nics[] = {
 /* A few NE2000 PCI clones, list not exhaustive */
-PCI_ROM(0x10ec, 0x8029, "rtl8029",      "Realtek 8029"),
-PCI_ROM(0x1186, 0x0300, "dlink-528",    "D-Link DE-528"),
-PCI_ROM(0x1050, 0x0940, "winbond940",   "Winbond NE2000-PCI"),		/* Winbond 86C940 / 89C940 */
-PCI_ROM(0x1050, 0x5a5a, "winbond940f",  "Winbond W89c940F"),		/* Winbond 89C940F */
-PCI_ROM(0x11f6, 0x1401, "compexrl2000", "Compex ReadyLink 2000"),
-PCI_ROM(0x8e2e, 0x3000, "ktiet32p2",    "KTI ET32P2"),
-PCI_ROM(0x4a14, 0x5000, "nv5000sc",     "NetVin NV5000SC"),
-PCI_ROM(0x12c3, 0x0058, "holtek80232",  "Holtek HT80232"),
-PCI_ROM(0x12c3, 0x5598, "holtek80229",  "Holtek HT80229"),
-PCI_ROM(0x10bd, 0x0e34, "surecom-ne34", "Surecom NE34"),
-PCI_ROM(0x1106, 0x0926, "via86c926",    "Via 86c926"),
+PCI_ROM(0x10ec, 0x8029, "rtl8029",      "Realtek 8029", 0),
+PCI_ROM(0x1186, 0x0300, "dlink-528",    "D-Link DE-528", 0),
+PCI_ROM(0x1050, 0x0940, "winbond940",   "Winbond NE2000-PCI", 0),		/* Winbond 86C940 / 89C940 */
+PCI_ROM(0x1050, 0x5a5a, "winbond940f",  "Winbond W89c940F", 0),		/* Winbond 89C940F */
+PCI_ROM(0x11f6, 0x1401, "compexrl2000", "Compex ReadyLink 2000", 0),
+PCI_ROM(0x8e2e, 0x3000, "ktiet32p2",    "KTI ET32P2", 0),
+PCI_ROM(0x4a14, 0x5000, "nv5000sc",     "NetVin NV5000SC", 0),
+PCI_ROM(0x12c3, 0x0058, "holtek80232",  "Holtek HT80232", 0),
+PCI_ROM(0x12c3, 0x5598, "holtek80229",  "Holtek HT80229", 0),
+PCI_ROM(0x10bd, 0x0e34, "surecom-ne34", "Surecom NE34", 0),
+PCI_ROM(0x1106, 0x0926, "via86c926",    "Via 86c926", 0),
 };
 
 PCI_DRIVER ( nepci_driver, nepci_nics, PCI_NO_CLASS );

src/drivers/net/pcnet32.c

@@ -1006,9 +1006,9 @@ static struct nic_operations pcnet32_operations = {
 };
 
 static struct pci_device_id pcnet32_nics[] = {
-	PCI_ROM(0x1022, 0x2000, "pcnet32", "AMD PCnet/PCI"),
-	PCI_ROM(0x1022, 0x2625, "pcnetfastiii", "AMD PCNet FAST III"),
-	PCI_ROM(0x1022, 0x2001, "amdhomepna", "AMD PCnet/HomePNA"),
+	PCI_ROM(0x1022, 0x2000, "pcnet32", "AMD PCnet/PCI", 0),
+	PCI_ROM(0x1022, 0x2625, "pcnetfastiii", "AMD PCNet FAST III", 0),
+	PCI_ROM(0x1022, 0x2001, "amdhomepna", "AMD PCnet/HomePNA", 0),
 };
 
 PCI_DRIVER ( pcnet32_driver, pcnet32_nics, PCI_NO_CLASS );

src/drivers/net/phantom/phantom.c

@@ -2100,7 +2100,7 @@ static void phantom_remove ( struct pci_device *pci ) {
 
 /** Phantom PCI IDs */
 static struct pci_device_id phantom_nics[] = {
-	PCI_ROM ( 0x4040, 0x0100, "nx", "NX" ),
+	PCI_ROM ( 0x4040, 0x0100, "nx", "NX", 0 ),
 };
 
 /** Phantom PCI driver */

src/drivers/net/pnic.c

@@ -268,7 +268,7 @@ static int pnic_probe ( struct pci_device *pci,
 
 static struct pci_device_id pnic_nics[] = {
 /* genrules.pl doesn't let us use macros for PCI IDs...*/
-PCI_ROM ( 0xfefe, 0xefef, "pnic", "Bochs Pseudo NIC Adaptor" ),
+PCI_ROM ( 0xfefe, 0xefef, "pnic", "Bochs Pseudo NIC Adaptor", 0 ),
 };
 
 struct pci_driver pnic_driver __pci_driver = {

src/drivers/net/prism2_pci.c

@@ -37,9 +37,9 @@ static void prism2_pci_disable ( struct nic *nic ) {
 }
 
 static struct pci_device_id prism2_pci_nics[] = {
-PCI_ROM(0x1260, 0x3873, "prism2_pci",	"Harris Semiconductor Prism2.5 clone"),
-PCI_ROM(0x1260, 0x3873, "hwp01170",	"ActionTec HWP01170"),
-PCI_ROM(0x1260, 0x3873, "dwl520",	"DLink DWL-520"),
+PCI_ROM(0x1260, 0x3873, "prism2_pci",	"Harris Semiconductor Prism2.5 clone", 0),
+PCI_ROM(0x1260, 0x3873, "hwp01170",	"ActionTec HWP01170", 0),
+PCI_ROM(0x1260, 0x3873, "dwl520",	"DLink DWL-520", 0),
 };
 
 PCI_DRIVER ( prism2_pci_driver, prism2_pci_nics, PCI_NO_CLASS );

src/drivers/net/prism2_plx.c

@@ -92,17 +92,17 @@ static void prism2_plx_disable ( struct nic *nic ) {
 }
 
 static struct pci_device_id prism2_plx_nics[] = {
-PCI_ROM(0x1385, 0x4100, "ma301",         "Netgear MA301"),
-PCI_ROM(0x10b7, 0x7770, "3c-airconnect", "3Com AirConnect"),
-PCI_ROM(0x111a, 0x1023, "ss1023",        "Siemens SpeedStream SS1023"),
-PCI_ROM(0x15e8, 0x0130, "correga",       "Correga"),
-PCI_ROM(0x1638, 0x1100, "smc2602w",      "SMC EZConnect SMC2602W"),	/* or Eumitcom PCI WL11000, Addtron AWA-100 */
-PCI_ROM(0x16ab, 0x1100, "gl24110p",      "Global Sun Tech GL24110P"),
-PCI_ROM(0x16ab, 0x1101, "16ab-1101",     "Unknown"),
-PCI_ROM(0x16ab, 0x1102, "wdt11",         "Linksys WDT11"),
-PCI_ROM(0x16ec, 0x3685, "usr2415",       "USR 2415"),
-PCI_ROM(0xec80, 0xec00, "f5d6000",       "Belkin F5D6000"),
-PCI_ROM(0x126c, 0x8030, "emobility",     "Nortel emobility"),
+PCI_ROM(0x1385, 0x4100, "ma301",         "Netgear MA301", 0),
+PCI_ROM(0x10b7, 0x7770, "3c-airconnect", "3Com AirConnect", 0),
+PCI_ROM(0x111a, 0x1023, "ss1023",        "Siemens SpeedStream SS1023", 0),
+PCI_ROM(0x15e8, 0x0130, "correga",       "Correga", 0),
+PCI_ROM(0x1638, 0x1100, "smc2602w",      "SMC EZConnect SMC2602W", 0),	/* or Eumitcom PCI WL11000, Addtron AWA-100 */
+PCI_ROM(0x16ab, 0x1100, "gl24110p",      "Global Sun Tech GL24110P", 0),
+PCI_ROM(0x16ab, 0x1101, "16ab-1101",     "Unknown", 0),
+PCI_ROM(0x16ab, 0x1102, "wdt11",         "Linksys WDT11", 0),
+PCI_ROM(0x16ec, 0x3685, "usr2415",       "USR 2415", 0),
+PCI_ROM(0xec80, 0xec00, "f5d6000",       "Belkin F5D6000", 0),
+PCI_ROM(0x126c, 0x8030, "emobility",     "Nortel emobility", 0),
 };
 
 PCI_DRIVER ( prism2_plx_driver, prism2_plx_nics, PCI_NO_CLASS );

src/drivers/net/r8169.c

@@ -2254,16 +2254,16 @@ rtl8169_remove ( struct pci_device *pdev )
 }
 
 static struct pci_device_id rtl8169_nics[] = {
-	PCI_ROM(0x10ec, 0x8129, "rtl8169-0x8129", "rtl8169-0x8129"),
-	PCI_ROM(0x10ec, 0x8136, "rtl8169-0x8136", "rtl8169-0x8136"),
-	PCI_ROM(0x10ec, 0x8167, "rtl8169-0x8167", "rtl8169-0x8167"),
-	PCI_ROM(0x10ec, 0x8168, "rtl8169-0x8168", "rtl8169-0x8168"),
-	PCI_ROM(0x10ec, 0x8169, "rtl8169-0x8169", "rtl8169-0x8169"),
-	PCI_ROM(0x1186, 0x4300, "rtl8169-0x4300", "rtl8169-0x4300"),
-	PCI_ROM(0x1259, 0xc107, "rtl8169-0xc107", "rtl8169-0xc107"),
-	PCI_ROM(0x16ec, 0x0116, "rtl8169-0x0116", "rtl8169-0x0116"),
-	PCI_ROM(0x1737, 0x1032, "rtl8169-0x1032", "rtl8169-0x1032"),
-	PCI_ROM(0x0001, 0x8168, "rtl8169-0x8168", "rtl8169-0x8168"),
+	PCI_ROM(0x10ec, 0x8129, "rtl8169-0x8129", "rtl8169-0x8129", 0),
+	PCI_ROM(0x10ec, 0x8136, "rtl8169-0x8136", "rtl8169-0x8136", 0),
+	PCI_ROM(0x10ec, 0x8167, "rtl8169-0x8167", "rtl8169-0x8167", 0),
+	PCI_ROM(0x10ec, 0x8168, "rtl8169-0x8168", "rtl8169-0x8168", 0),
+	PCI_ROM(0x10ec, 0x8169, "rtl8169-0x8169", "rtl8169-0x8169", 0),
+	PCI_ROM(0x1186, 0x4300, "rtl8169-0x4300", "rtl8169-0x4300", 0),
+	PCI_ROM(0x1259, 0xc107, "rtl8169-0xc107", "rtl8169-0xc107", 0),
+	PCI_ROM(0x16ec, 0x0116, "rtl8169-0x0116", "rtl8169-0x0116", 0),
+	PCI_ROM(0x1737, 0x1032, "rtl8169-0x1032", "rtl8169-0x1032", 0),
+	PCI_ROM(0x0001, 0x8168, "rtl8169-0x8168", "rtl8169-0x8168", 0),
 };
 
 struct pci_driver rtl8169_driver __pci_driver = {

src/drivers/net/rtl8139.c

@@ -563,20 +563,20 @@ static void rtl_remove ( struct pci_device *pci ) {
 }
 
 static struct pci_device_id rtl8139_nics[] = {
-PCI_ROM(0x10ec, 0x8129, "rtl8129",       "Realtek 8129"),
-PCI_ROM(0x10ec, 0x8139, "rtl8139",       "Realtek 8139"),
-PCI_ROM(0x10ec, 0x8138, "rtl8139b",      "Realtek 8139B"),
-PCI_ROM(0x1186, 0x1300, "dfe538",        "DFE530TX+/DFE538TX"),
-PCI_ROM(0x1113, 0x1211, "smc1211-1",     "SMC EZ10/100"),
-PCI_ROM(0x1112, 0x1211, "smc1211",       "SMC EZ10/100"),
-PCI_ROM(0x1500, 0x1360, "delta8139",     "Delta Electronics 8139"),
-PCI_ROM(0x4033, 0x1360, "addtron8139",   "Addtron Technology 8139"),
-PCI_ROM(0x1186, 0x1340, "dfe690txd",     "D-Link DFE690TXD"),
-PCI_ROM(0x13d1, 0xab06, "fe2000vx",      "AboCom FE2000VX"),
-PCI_ROM(0x1259, 0xa117, "allied8139",    "Allied Telesyn 8139"),
-PCI_ROM(0x14ea, 0xab06, "fnw3603tx",     "Planex FNW-3603-TX"),
-PCI_ROM(0x14ea, 0xab07, "fnw3800tx",     "Planex FNW-3800-TX"),
-PCI_ROM(0xffff, 0x8139, "clone-rtl8139", "Cloned 8139"),
+PCI_ROM(0x10ec, 0x8129, "rtl8129",       "Realtek 8129", 0),
+PCI_ROM(0x10ec, 0x8139, "rtl8139",       "Realtek 8139", 0),
+PCI_ROM(0x10ec, 0x8138, "rtl8139b",      "Realtek 8139B", 0),
+PCI_ROM(0x1186, 0x1300, "dfe538",        "DFE530TX+/DFE538TX", 0),
+PCI_ROM(0x1113, 0x1211, "smc1211-1",     "SMC EZ10/100", 0),
+PCI_ROM(0x1112, 0x1211, "smc1211",       "SMC EZ10/100", 0),
+PCI_ROM(0x1500, 0x1360, "delta8139",     "Delta Electronics 8139", 0),
+PCI_ROM(0x4033, 0x1360, "addtron8139",   "Addtron Technology 8139", 0),
+PCI_ROM(0x1186, 0x1340, "dfe690txd",     "D-Link DFE690TXD", 0),
+PCI_ROM(0x13d1, 0xab06, "fe2000vx",      "AboCom FE2000VX", 0),
+PCI_ROM(0x1259, 0xa117, "allied8139",    "Allied Telesyn 8139", 0),
+PCI_ROM(0x14ea, 0xab06, "fnw3603tx",     "Planex FNW-3603-TX", 0),
+PCI_ROM(0x14ea, 0xab07, "fnw3800tx",     "Planex FNW-3800-TX", 0),
+PCI_ROM(0xffff, 0x8139, "clone-rtl8139", "Cloned 8139", 0),
 };
 
 struct pci_driver rtl8139_driver __pci_driver = {

src/drivers/net/sis900.c

@@ -1278,8 +1278,8 @@ static struct nic_operations sis900_operations = {
 };
 
 static struct pci_device_id sis900_nics[] = {
-PCI_ROM(0x1039, 0x0900, "sis900",  "SIS900"),
-PCI_ROM(0x1039, 0x7016, "sis7016", "SIS7016"),
+PCI_ROM(0x1039, 0x0900, "sis900",  "SIS900", 0),
+PCI_ROM(0x1039, 0x7016, "sis7016", "SIS7016", 0),
 };
 
 PCI_DRIVER ( sis900_driver, sis900_nics, PCI_NO_CLASS );

src/drivers/net/sundance.c

@@ -883,9 +883,9 @@ static void set_rx_mode(struct nic *nic __unused)
 }
 
 static struct pci_device_id sundance_nics[] = {
-	PCI_ROM(0x13f0, 0x0201, "sundance", "ST201 Sundance 'Alta' based Adaptor"),
-	PCI_ROM(0x1186, 0x1002, "dfe530txs", "D-Link DFE530TXS (Sundance ST201 Alta)"),
-	PCI_ROM(0x13f0, 0x0200, "ip100a", "IC+ IP100A"),
+	PCI_ROM(0x13f0, 0x0201, "sundance", "ST201 Sundance 'Alta' based Adaptor", 0),
+	PCI_ROM(0x1186, 0x1002, "dfe530txs", "D-Link DFE530TXS (Sundance ST201 Alta)", 0),
+	PCI_ROM(0x13f0, 0x0200, "ip100a", "IC+ IP100A", 0),
 };
 
 PCI_DRIVER ( sundance_driver, sundance_nics, PCI_NO_CLASS );

src/drivers/net/tg3.c

@@ -3384,38 +3384,38 @@ static int tg3_probe ( struct nic *nic, struct pci_device *pdev ) {
 
 
 static struct pci_device_id tg3_nics[] = {
-PCI_ROM(0x14e4, 0x1644, "tg3-5700",        "Broadcom Tigon 3 5700"),
-PCI_ROM(0x14e4, 0x1645, "tg3-5701",        "Broadcom Tigon 3 5701"),
-PCI_ROM(0x14e4, 0x1646, "tg3-5702",        "Broadcom Tigon 3 5702"),
-PCI_ROM(0x14e4, 0x1647, "tg3-5703",        "Broadcom Tigon 3 5703"),
-PCI_ROM(0x14e4, 0x1648, "tg3-5704",        "Broadcom Tigon 3 5704"),
-PCI_ROM(0x14e4, 0x164d, "tg3-5702FE",      "Broadcom Tigon 3 5702FE"),
-PCI_ROM(0x14e4, 0x1653, "tg3-5705",        "Broadcom Tigon 3 5705"),
-PCI_ROM(0x14e4, 0x1654, "tg3-5705_2",      "Broadcom Tigon 3 5705_2"),
-PCI_ROM(0x14e4, 0x1659, "tg3-5721",        "Broadcom Tigon 3 5721"),
-PCI_ROM(0x14e4, 0x165d, "tg3-5705M",       "Broadcom Tigon 3 5705M"),
-PCI_ROM(0x14e4, 0x165e, "tg3-5705M_2",     "Broadcom Tigon 3 5705M_2"),
-PCI_ROM(0x14e4, 0x1677, "tg3-5751",        "Broadcom Tigon 3 5751"),
-PCI_ROM(0x14e4, 0x167a, "tg3-5754",        "Broadcom Tigon 3 5754"),
-PCI_ROM(0x14e4, 0x1693, "tg3-5787",	   "Broadcom Tigon 3 5787"),
-PCI_ROM(0x14e4, 0x1696, "tg3-5782",        "Broadcom Tigon 3 5782"),
-PCI_ROM(0x14e4, 0x169a, "tg3-5786",        "Broadcom Tigon 3 5786"),
-PCI_ROM(0x14e4, 0x169c, "tg3-5788",        "Broadcom Tigon 3 5788"),
-PCI_ROM(0x14e4, 0x169d, "tg3-5789",        "Broadcom Tigon 3 5789"),
-PCI_ROM(0x14e4, 0x16a6, "tg3-5702X",       "Broadcom Tigon 3 5702X"),
-PCI_ROM(0x14e4, 0x16a7, "tg3-5703X",       "Broadcom Tigon 3 5703X"),
-PCI_ROM(0x14e4, 0x16a8, "tg3-5704S",       "Broadcom Tigon 3 5704S"),
-PCI_ROM(0x14e4, 0x16c6, "tg3-5702A3",      "Broadcom Tigon 3 5702A3"),
-PCI_ROM(0x14e4, 0x16c7, "tg3-5703A3",      "Broadcom Tigon 3 5703A3"),
-PCI_ROM(0x14e4, 0x170d, "tg3-5901",        "Broadcom Tigon 3 5901"),
-PCI_ROM(0x14e4, 0x170e, "tg3-5901_2",      "Broadcom Tigon 3 5901_2"),
-PCI_ROM(0x1148, 0x4400, "tg3-9DXX",        "Syskonnect 9DXX"),
-PCI_ROM(0x1148, 0x4500, "tg3-9MXX",        "Syskonnect 9MXX"),
-PCI_ROM(0x173b, 0x03e8, "tg3-ac1000",      "Altima AC1000"),
-PCI_ROM(0x173b, 0x03e9, "tg3-ac1001",      "Altima AC1001"),
-PCI_ROM(0x173b, 0x03ea, "tg3-ac9100",      "Altima AC9100"),
-PCI_ROM(0x173b, 0x03eb, "tg3-ac1003",      "Altima AC1003"),
-PCI_ROM(0x0e11, 0x00ca, "tg3-hp",	   "HP Tigon 3"),
+PCI_ROM(0x14e4, 0x1644, "tg3-5700",        "Broadcom Tigon 3 5700", 0),
+PCI_ROM(0x14e4, 0x1645, "tg3-5701",        "Broadcom Tigon 3 5701", 0),
+PCI_ROM(0x14e4, 0x1646, "tg3-5702",        "Broadcom Tigon 3 5702", 0),
+PCI_ROM(0x14e4, 0x1647, "tg3-5703",        "Broadcom Tigon 3 5703", 0),
+PCI_ROM(0x14e4, 0x1648, "tg3-5704",        "Broadcom Tigon 3 5704", 0),
+PCI_ROM(0x14e4, 0x164d, "tg3-5702FE",      "Broadcom Tigon 3 5702FE", 0),
+PCI_ROM(0x14e4, 0x1653, "tg3-5705",        "Broadcom Tigon 3 5705", 0),
+PCI_ROM(0x14e4, 0x1654, "tg3-5705_2",      "Broadcom Tigon 3 5705_2", 0),
+PCI_ROM(0x14e4, 0x1659, "tg3-5721",        "Broadcom Tigon 3 5721", 0),
+PCI_ROM(0x14e4, 0x165d, "tg3-5705M",       "Broadcom Tigon 3 5705M", 0),
+PCI_ROM(0x14e4, 0x165e, "tg3-5705M_2",     "Broadcom Tigon 3 5705M_2", 0),
+PCI_ROM(0x14e4, 0x1677, "tg3-5751",        "Broadcom Tigon 3 5751", 0),
+PCI_ROM(0x14e4, 0x167a, "tg3-5754",        "Broadcom Tigon 3 5754", 0),
+PCI_ROM(0x14e4, 0x1693, "tg3-5787",	   "Broadcom Tigon 3 5787", 0),
+PCI_ROM(0x14e4, 0x1696, "tg3-5782",        "Broadcom Tigon 3 5782", 0),
+PCI_ROM(0x14e4, 0x169a, "tg3-5786",        "Broadcom Tigon 3 5786", 0),
+PCI_ROM(0x14e4, 0x169c, "tg3-5788",        "Broadcom Tigon 3 5788", 0),
+PCI_ROM(0x14e4, 0x169d, "tg3-5789",        "Broadcom Tigon 3 5789", 0),
+PCI_ROM(0x14e4, 0x16a6, "tg3-5702X",       "Broadcom Tigon 3 5702X", 0),
+PCI_ROM(0x14e4, 0x16a7, "tg3-5703X",       "Broadcom Tigon 3 5703X", 0),
+PCI_ROM(0x14e4, 0x16a8, "tg3-5704S",       "Broadcom Tigon 3 5704S", 0),
+PCI_ROM(0x14e4, 0x16c6, "tg3-5702A3",      "Broadcom Tigon 3 5702A3", 0),
+PCI_ROM(0x14e4, 0x16c7, "tg3-5703A3",      "Broadcom Tigon 3 5703A3", 0),
+PCI_ROM(0x14e4, 0x170d, "tg3-5901",        "Broadcom Tigon 3 5901", 0),
+PCI_ROM(0x14e4, 0x170e, "tg3-5901_2",      "Broadcom Tigon 3 5901_2", 0),
+PCI_ROM(0x1148, 0x4400, "tg3-9DXX",        "Syskonnect 9DXX", 0),
+PCI_ROM(0x1148, 0x4500, "tg3-9MXX",        "Syskonnect 9MXX", 0),
+PCI_ROM(0x173b, 0x03e8, "tg3-ac1000",      "Altima AC1000", 0),
+PCI_ROM(0x173b, 0x03e9, "tg3-ac1001",      "Altima AC1001", 0),
+PCI_ROM(0x173b, 0x03ea, "tg3-ac9100",      "Altima AC9100", 0),
+PCI_ROM(0x173b, 0x03eb, "tg3-ac1003",      "Altima AC1003", 0),
+PCI_ROM(0x0e11, 0x00ca, "tg3-hp",	   "HP Tigon 3", 0),
 };
 
 PCI_DRIVER ( tg3_driver, tg3_nics, PCI_NO_CLASS );

src/drivers/net/tlan.c

@@ -1691,19 +1691,19 @@ void TLan_PhyMonitor(struct net_device *dev)
 #endif				/* MONITOR */
 
 static struct pci_device_id tlan_nics[] = {
-	PCI_ROM(0x0e11, 0xae34, "netel10", "Compaq Netelligent 10 T PCI UTP"),
-	PCI_ROM(0x0e11, 0xae32, "netel100","Compaq Netelligent 10/100 TX PCI UTP"),
-	PCI_ROM(0x0e11, 0xae35, "netflex3i", "Compaq Integrated NetFlex-3/P"),
-	PCI_ROM(0x0e11, 0xf130, "thunder", "Compaq NetFlex-3/P"),
-	PCI_ROM(0x0e11, 0xf150, "netflex3b", "Compaq NetFlex-3/P"),
-	PCI_ROM(0x0e11, 0xae43, "netel100pi", "Compaq Netelligent Integrated 10/100 TX UTP"),
-	PCI_ROM(0x0e11, 0xae40, "netel100d", "Compaq Netelligent Dual 10/100 TX PCI UTP"),
-	PCI_ROM(0x0e11, 0xb011, "netel100i", "Compaq Netelligent 10/100 TX Embedded UTP"),
-	PCI_ROM(0x108d, 0x0013, "oc2183", "Olicom OC-2183/2185"),
-	PCI_ROM(0x108d, 0x0012, "oc2325", "Olicom OC-2325"),
-	PCI_ROM(0x108d, 0x0014, "oc2326", "Olicom OC-2326"),
-	PCI_ROM(0x0e11, 0xb030, "netelligent_10_100_ws_5100", "Compaq Netelligent 10/100 TX UTP"),
-	PCI_ROM(0x0e11, 0xb012, "netelligent_10_t2", "Compaq Netelligent 10 T/2 PCI UTP/Coax"),
+	PCI_ROM(0x0e11, 0xae34, "netel10", "Compaq Netelligent 10 T PCI UTP", 0),
+	PCI_ROM(0x0e11, 0xae32, "netel100","Compaq Netelligent 10/100 TX PCI UTP", 0),
+	PCI_ROM(0x0e11, 0xae35, "netflex3i", "Compaq Integrated NetFlex-3/P", 0),
+	PCI_ROM(0x0e11, 0xf130, "thunder", "Compaq NetFlex-3/P", 0),
+	PCI_ROM(0x0e11, 0xf150, "netflex3b", "Compaq NetFlex-3/P", 0),
+	PCI_ROM(0x0e11, 0xae43, "netel100pi", "Compaq Netelligent Integrated 10/100 TX UTP", 0),
+	PCI_ROM(0x0e11, 0xae40, "netel100d", "Compaq Netelligent Dual 10/100 TX PCI UTP", 0),
+	PCI_ROM(0x0e11, 0xb011, "netel100i", "Compaq Netelligent 10/100 TX Embedded UTP", 0),
+	PCI_ROM(0x108d, 0x0013, "oc2183", "Olicom OC-2183/2185", 0),
+	PCI_ROM(0x108d, 0x0012, "oc2325", "Olicom OC-2325", 0),
+	PCI_ROM(0x108d, 0x0014, "oc2326", "Olicom OC-2326", 0),
+	PCI_ROM(0x0e11, 0xb030, "netelligent_10_100_ws_5100", "Compaq Netelligent 10/100 TX UTP", 0),
+	PCI_ROM(0x0e11, 0xb012, "netelligent_10_t2", "Compaq Netelligent 10 T/2 PCI UTP/Coax", 0),
 };
 
 PCI_DRIVER ( tlan_driver, tlan_nics, PCI_NO_CLASS );

src/drivers/net/tulip.c

@@ -2045,42 +2045,42 @@ static int tulip_check_duplex(struct nic *nic)
 }
 
 static struct pci_device_id tulip_nics[] = {
-PCI_ROM(0x1011, 0x0002, "dc21040",     "Digital Tulip"),
-PCI_ROM(0x1011, 0x0009, "ds21140",     "Digital Tulip Fast"),
-PCI_ROM(0x1011, 0x0014, "dc21041",     "Digital Tulip+"),
-PCI_ROM(0x1011, 0x0019, "ds21142",     "Digital Tulip 21142"),
-PCI_ROM(0x10b7, 0x9300, "3csoho100b-tx","3ComSOHO100B-TX"),
-PCI_ROM(0x10b9, 0x5261, "ali1563",     "ALi 1563 integrated ethernet"),
-PCI_ROM(0x10d9, 0x0512, "mx98713",     "Macronix MX987x3"),
-PCI_ROM(0x10d9, 0x0531, "mx98715",     "Macronix MX987x5"),
-PCI_ROM(0x1113, 0x1217, "mxic-98715",  "Macronix MX987x5"),
-PCI_ROM(0x11ad, 0xc115, "lc82c115",    "LinkSys LNE100TX"),
-PCI_ROM(0x11ad, 0x0002, "82c168",      "Netgear FA310TX"),
-PCI_ROM(0x1282, 0x9100, "dm9100",      "Davicom 9100"),
-PCI_ROM(0x1282, 0x9102, "dm9102",      "Davicom 9102"),
-PCI_ROM(0x1282, 0x9009, "dm9009",      "Davicom 9009"),
-PCI_ROM(0x1282, 0x9132, "dm9132",      "Davicom 9132"),
-PCI_ROM(0x1317, 0x0985, "centaur-p",   "ADMtek Centaur-P"),
-PCI_ROM(0x1317, 0x0981, "an981",       "ADMtek AN981 Comet"),		/* ADMTek Centaur-P (stmicro) */
-PCI_ROM(0x1113, 0x1216, "an983",       "ADMTek AN983 Comet"),
-PCI_ROM(0x1317, 0x9511, "an983b",      "ADMTek Comet 983b"),
-PCI_ROM(0x1317, 0x1985, "centaur-c",   "ADMTek Centaur-C"),
-PCI_ROM(0x8086, 0x0039, "intel21145",  "Intel Tulip"),
-PCI_ROM(0x125b, 0x1400, "ax88140",     "ASIX AX88140"),
-PCI_ROM(0x11f6, 0x9881, "rl100tx",     "Compex RL100-TX"),
-PCI_ROM(0x115d, 0x0003, "xircomtulip", "Xircom Tulip"),
-PCI_ROM(0x104a, 0x0981, "tulip-0981",  "Tulip 0x104a 0x0981"),
-PCI_ROM(0x104a, 0x2774, "SGThomson-STE10100A", "Tulip 0x104a 0x2774"),	/*Modified by Ramesh Chander*/
-PCI_ROM(0x1113, 0x9511, "tulip-9511",  "Tulip 0x1113 0x9511"),
-PCI_ROM(0x1186, 0x1561, "tulip-1561",  "Tulip 0x1186 0x1561"),
-PCI_ROM(0x1259, 0xa120, "tulip-a120",  "Tulip 0x1259 0xa120"),
-PCI_ROM(0x13d1, 0xab02, "tulip-ab02",  "Tulip 0x13d1 0xab02"),
-PCI_ROM(0x13d1, 0xab03, "tulip-ab03",  "Tulip 0x13d1 0xab03"),
-PCI_ROM(0x13d1, 0xab08, "tulip-ab08",  "Tulip 0x13d1 0xab08"),
-PCI_ROM(0x14f1, 0x1803, "lanfinity",   "Conexant LANfinity"),
-PCI_ROM(0x1626, 0x8410, "tulip-8410",  "Tulip 0x1626 0x8410"),
-PCI_ROM(0x1737, 0xab08, "tulip-1737-ab08","Tulip 0x1737 0xab08"),
-PCI_ROM(0x1737, 0xab09, "tulip-ab09",  "Tulip 0x1737 0xab09"),
+PCI_ROM(0x1011, 0x0002, "dc21040",     "Digital Tulip", 0),
+PCI_ROM(0x1011, 0x0009, "ds21140",     "Digital Tulip Fast", 0),
+PCI_ROM(0x1011, 0x0014, "dc21041",     "Digital Tulip+", 0),
+PCI_ROM(0x1011, 0x0019, "ds21142",     "Digital Tulip 21142", 0),
+PCI_ROM(0x10b7, 0x9300, "3csoho100b-tx","3ComSOHO100B-TX", 0),
+PCI_ROM(0x10b9, 0x5261, "ali1563",     "ALi 1563 integrated ethernet", 0),
+PCI_ROM(0x10d9, 0x0512, "mx98713",     "Macronix MX987x3", 0),
+PCI_ROM(0x10d9, 0x0531, "mx98715",     "Macronix MX987x5", 0),
+PCI_ROM(0x1113, 0x1217, "mxic-98715",  "Macronix MX987x5", 0),
+PCI_ROM(0x11ad, 0xc115, "lc82c115",    "LinkSys LNE100TX", 0),
+PCI_ROM(0x11ad, 0x0002, "82c168",      "Netgear FA310TX", 0),
+PCI_ROM(0x1282, 0x9100, "dm9100",      "Davicom 9100", 0),
+PCI_ROM(0x1282, 0x9102, "dm9102",      "Davicom 9102", 0),
+PCI_ROM(0x1282, 0x9009, "dm9009",      "Davicom 9009", 0),
+PCI_ROM(0x1282, 0x9132, "dm9132",      "Davicom 9132", 0),
+PCI_ROM(0x1317, 0x0985, "centaur-p",   "ADMtek Centaur-P", 0),
+PCI_ROM(0x1317, 0x0981, "an981",       "ADMtek AN981 Comet", 0),		/* ADMTek Centaur-P (stmicro) */
+PCI_ROM(0x1113, 0x1216, "an983",       "ADMTek AN983 Comet", 0),
+PCI_ROM(0x1317, 0x9511, "an983b",      "ADMTek Comet 983b", 0),
+PCI_ROM(0x1317, 0x1985, "centaur-c",   "ADMTek Centaur-C", 0),
+PCI_ROM(0x8086, 0x0039, "intel21145",  "Intel Tulip", 0),
+PCI_ROM(0x125b, 0x1400, "ax88140",     "ASIX AX88140", 0),
+PCI_ROM(0x11f6, 0x9881, "rl100tx",     "Compex RL100-TX", 0),
+PCI_ROM(0x115d, 0x0003, "xircomtulip", "Xircom Tulip", 0),
+PCI_ROM(0x104a, 0x0981, "tulip-0981",  "Tulip 0x104a 0x0981", 0),
+PCI_ROM(0x104a, 0x2774, "SGThomson-STE10100A", "Tulip 0x104a 0x2774", 0),	/*Modified by Ramesh Chander*/
+PCI_ROM(0x1113, 0x9511, "tulip-9511",  "Tulip 0x1113 0x9511", 0),
+PCI_ROM(0x1186, 0x1561, "tulip-1561",  "Tulip 0x1186 0x1561", 0),
+PCI_ROM(0x1259, 0xa120, "tulip-a120",  "Tulip 0x1259 0xa120", 0),
+PCI_ROM(0x13d1, 0xab02, "tulip-ab02",  "Tulip 0x13d1 0xab02", 0),
+PCI_ROM(0x13d1, 0xab03, "tulip-ab03",  "Tulip 0x13d1 0xab03", 0),
+PCI_ROM(0x13d1, 0xab08, "tulip-ab08",  "Tulip 0x13d1 0xab08", 0),
+PCI_ROM(0x14f1, 0x1803, "lanfinity",   "Conexant LANfinity", 0),
+PCI_ROM(0x1626, 0x8410, "tulip-8410",  "Tulip 0x1626 0x8410", 0),
+PCI_ROM(0x1737, 0xab08, "tulip-1737-ab08","Tulip 0x1737 0xab08", 0),
+PCI_ROM(0x1737, 0xab09, "tulip-ab09",  "Tulip 0x1737 0xab09", 0),
 };
 
 PCI_DRIVER ( tulip_driver, tulip_nics, PCI_NO_CLASS );

src/drivers/net/via-rhine.c

@@ -1424,11 +1424,11 @@ static struct nic_operations rhine_operations = {
 };
 
 static struct pci_device_id rhine_nics[] = {
-PCI_ROM(0x1106, 0x3065, "dlink-530tx",     "VIA 6102"),
-PCI_ROM(0x1106, 0x3106, "via-rhine-6105",  "VIA 6105"),
-PCI_ROM(0x1106, 0x3043, "dlink-530tx-old", "VIA 3043"),		/* Rhine-I 86c100a */
-PCI_ROM(0x1106, 0x3053, "via6105m",        "VIA 6105M"),	
-PCI_ROM(0x1106, 0x6100, "via-rhine-old",   "VIA 86C100A"),	/* Rhine-II */
+PCI_ROM(0x1106, 0x3065, "dlink-530tx",     "VIA 6102", 0),
+PCI_ROM(0x1106, 0x3106, "via-rhine-6105",  "VIA 6105", 0),
+PCI_ROM(0x1106, 0x3043, "dlink-530tx-old", "VIA 3043", 0),		/* Rhine-I 86c100a */
+PCI_ROM(0x1106, 0x3053, "via6105m",        "VIA 6105M", 0),
+PCI_ROM(0x1106, 0x6100, "via-rhine-old",   "VIA 86C100A", 0),	/* Rhine-II */
 };
 
 PCI_DRIVER ( rhine_driver, rhine_nics, PCI_NO_CLASS );

src/drivers/net/via-velocity.c

@@ -1930,7 +1930,7 @@ int pci_set_power_state(struct pci_device *dev, int state)
 }
 
 static struct pci_device_id velocity_nics[] = {
-	PCI_ROM(0x1106, 0x3119, "via-velocity", "VIA Networking Velocity Family Gigabit Ethernet Adapter"),
+	PCI_ROM(0x1106, 0x3119, "via-velocity", "VIA Networking Velocity Family Gigabit Ethernet Adapter", 0),
 };
 
 PCI_DRIVER ( velocity_driver, velocity_nics, PCI_NO_CLASS );

src/drivers/net/virtio-net.c

@@ -298,7 +298,7 @@ static int virtnet_probe(struct nic *nic, struct pci_device *pci)
 }
 
 static struct pci_device_id virtnet_nics[] = {
-PCI_ROM(0x1af4, 0x1000, "virtio-net",              "Virtio Network Interface"),
+PCI_ROM(0x1af4, 0x1000, "virtio-net",              "Virtio Network Interface", 0),
 };
 
 PCI_DRIVER ( virtnet_driver, virtnet_nics, PCI_NO_CLASS );

src/drivers/net/w89c840.c

@@ -610,8 +610,8 @@ static struct nic_operations w89c840_operations = {
 };
 
 static struct pci_device_id w89c840_nics[] = {
-PCI_ROM(0x1050, 0x0840, "winbond840",     "Winbond W89C840F"),
-PCI_ROM(0x11f6, 0x2011, "compexrl100atx", "Compex RL100ATX"),
+PCI_ROM(0x1050, 0x0840, "winbond840",     "Winbond W89C840F", 0),
+PCI_ROM(0x11f6, 0x2011, "compexrl100atx", "Compex RL100ATX", 0),
 };
 
 PCI_DRIVER ( w89c840_driver, w89c840_nics, PCI_NO_CLASS );

src/include/gpxe/pci.h

@@ -241,6 +241,8 @@ struct pci_device_id {
 	uint16_t vendor;
 	/** PCI device ID */
 	uint16_t device;
+	/** Arbitrary driver data */
+	unsigned long driver_data;
 };
 
 /** Match-anything ID */
@@ -328,10 +330,11 @@ struct pci_driver {
  * is also parsed by parserom.pl to generate Makefile rules and files
  * for rom-o-matic.
  */
-#define PCI_ROM( _vendor, _device, _name, _description ) {	\
-	.vendor = _vendor,					\
-	.device = _device,					\
-	.name = _name,						\
+#define PCI_ROM( _vendor, _device, _name, _description, _data ) {	\
+	.vendor = _vendor,						\
+	.device = _device,						\
+	.name = _name,							\
+	.driver_data = _data						\
 }
 
 extern void adjust_pci_device ( struct pci_device *pci );

src/util/parserom.pl

@@ -45,7 +45,8 @@ while ( <DRV> ) {
          \s*0x([0-9A-Fa-f]{4})\s*, # PCI vendor
          \s*0x([0-9A-Fa-f]{4})\s*, # PCI device
          \s*\"([^\"]*)\"\s*,	   # Image
-         \s*\"([^\"]*)\"\s*	   # Description
+         \s*\"([^\"]*)\"\s*,	   # Description
+         \s*.*\s*		   # Driver data
        \)/x ) {
     ( my $vendor, my $device, my $image, my $desc ) = ( lc $1, lc $2, $3, $4 );
     rom ( "pci", $image, $desc, $vendor, $device );