From 35e6f3e58abd8addc19113f7e00e3cafea315846 Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@etherboot.org>
Date: Tue, 12 Apr 2005 23:13:54 +0000
Subject: [PATCH] Minor regexp tweaks to catch degenerate cases.

---
 src/drivers/net/mtd80x.c    | 12 ++++--------
 src/drivers/net/via-rhine.c | 12 ++++--------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/drivers/net/mtd80x.c b/src/drivers/net/mtd80x.c
index a09fdfba7..941fb16cf 100644
--- 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 d5e4812eb..2f5878bff 100644
--- 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 */