Minor regexp tweaks to catch degenerate cases.

diff --git a/src/drivers/net/mtd80x.c b/src/drivers/net/mtd80x.c
index a09fdfba712572ac8827d3080fda84e87bf42a38..941fb16cf37c63e067bf5df9a4571e0b878a6f6c 100644 (file)
--- a/src/drivers/net/mtd80x.c
+++ b/src/drivers/net/mtd80x.c
@@ -1086,11 +1086,7 @@ static void getlinktype(struct nic *dev)
 }
 
 
-struct pci_driver mtd80x_driver __pci_driver ={
-        .type     = NIC_DRIVER,
-        .name     = "MTD80X",
-        .probe    = mtd_probe,
-        .ids      = mtd80x_nics,
-        .id_count = sizeof(mtd80x_nics)/sizeof(mtd80x_nics[0]),
-        .class    = 0,
-};
+static struct pci_driver mtd80x_driver =
+       PCI_DRIVER ( "MTD80X", mtd80x_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "MTD80X", mtd_probe );

diff --git a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c
index d5e4812ebde131c41a7a6d208763438e5b935a04..2f5878bff685061690d11b20bd13da9fa15a54f7 100644 (file)
--- a/src/drivers/net/via-rhine.c
+++ b/src/drivers/net/via-rhine.c
@@ -1414,13 +1414,9 @@ 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 = {
-       .type     = NIC_DRIVER,
-       .name     = "VIA 86C100",
-       .probe    = rhine_probe,
-       .ids      = rhine_nics,
-       .id_count = sizeof(rhine_nics)/sizeof(rhine_nics[0]),
-       .class    = 0,
-};
+static struct pci_driver rhine_driver =
+       PCI_DRIVER ( "VIA 86C100", rhine_nics, PCI_NO_CLASS );
+
+BOOT_DRIVER ( "VIA 86C100", rhine_probe );
 
 /* EOF via-rhine.c */