From 2c6061783617c6afce60ebb1b298602ce96359d2 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 14 Apr 2005 15:00:05 +0000 Subject: Automatically modified by perl -pi -0777 -e 's/\s*?if\s*\(\s*!\s*find_pci_device.*?,\s*\&(\w+)\s*\)\s*\)\s*return\s*0;(.*BOOT_DRIVER\s*\(.*?,)(.*?\))/$2 find_pci_boot_device, $1,$3/sm' *.c --- src/drivers/net/via-rhine.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/drivers/net/via-rhine.c') diff --git a/src/drivers/net/via-rhine.c b/src/drivers/net/via-rhine.c index 173520e5..7c68e873 100644 --- a/src/drivers/net/via-rhine.c +++ b/src/drivers/net/via-rhine.c @@ -958,9 +958,6 @@ rhine_probe ( struct dev *dev, struct pci_device *pci ) { struct nic *nic = nic_device ( dev ); struct rhine_private *tp = (struct rhine_private *) nic->priv_data; - if ( ! find_pci_device ( pci, &rhine_driver ) ) - return 0; - if (!pci->ioaddr) return 0; rhine_probe1 (nic, pci, pci->ioaddr, pci->dev_id, -1); @@ -1424,6 +1421,6 @@ PCI_ROM(0x1106, 0x6100, "via-rhine-old", "VIA 86C100A"), /* Rhine-II */ static struct pci_driver rhine_driver = PCI_DRIVER ( "VIA 86C100", rhine_nics, PCI_NO_CLASS ); -BOOT_DRIVER ( "VIA 86C100", rhine_probe ); +BOOT_DRIVER ( "VIA 86C100", find_pci_boot_device, rhine_driver, rhine_probe ); /* EOF via-rhine.c */ -- cgit v1.2.3-55-g7522