|
@@ -53,7 +53,6 @@
|
53
|
53
|
/* Globals */
|
54
|
54
|
|
55
|
55
|
static struct nic_operations sis900_operations;
|
56
|
|
-static struct pci_driver sis900_driver;
|
57
|
56
|
|
58
|
57
|
static int sis900_debug = 0;
|
59
|
58
|
|
|
@@ -128,7 +127,7 @@ static struct pci_driver sis_bridge_driver =
|
128
|
127
|
|
129
|
128
|
/* Function Prototypes */
|
130
|
129
|
|
131
|
|
-static int sis900_probe(struct dev *dev);
|
|
130
|
+static int sis900_probe(struct dev *dev,struct pci_device *pci);
|
132
|
131
|
|
133
|
132
|
static u16 sis900_read_eeprom(int location);
|
134
|
133
|
static void sis900_mdio_reset(long mdio_addr);
|
|
@@ -310,18 +309,14 @@ static int sis635_get_mac_addr(struct pci_device * pci_dev __unused, struct nic
|
310
|
309
|
* Returns: struct nic *: pointer to NIC data structure
|
311
|
310
|
*/
|
312
|
311
|
|
313
|
|
-static int sis900_probe ( struct dev *dev ) {
|
|
312
|
+static int sis900_probe ( struct dev *dev, struct pci_device *pci ) {
|
314
|
313
|
struct nic *nic = nic_device ( dev );
|
315
|
|
- struct pci_device *pci = pci_device ( dev );
|
316
|
314
|
int i;
|
317
|
315
|
int found=0;
|
318
|
316
|
int phy_addr;
|
319
|
317
|
u8 revision;
|
320
|
318
|
int ret;
|
321
|
319
|
|
322
|
|
- if ( ! find_pci_device ( pci, &sis900_driver ) )
|
323
|
|
- return 0;
|
324
|
|
-
|
325
|
320
|
if (pci->ioaddr == 0)
|
326
|
321
|
return 0;
|
327
|
322
|
|
|
@@ -1265,4 +1260,4 @@ PCI_ROM(0x1039, 0x7016, "sis7016", "SIS7016"),
|
1265
|
1260
|
static struct pci_driver sis900_driver =
|
1266
|
1261
|
PCI_DRIVER ( "SIS900", sis900_nics, PCI_NO_CLASS );
|
1267
|
1262
|
|
1268
|
|
-BOOT_DRIVER ( "SIS900", sis900_probe );
|
|
1263
|
+BOOT_DRIVER ( "SIS900", find_pci_boot_device, sis900_driver, sis900_probe );
|