|
@@ -1970,9 +1970,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
|
|
lp->options |= PCNET32_PORT_MII;
|
|
lp->options |= PCNET32_PORT_MII;
|
|
}
|
|
}
|
|
|
|
|
|
- init_timer(&lp->watchdog_timer);
|
|
|
|
- lp->watchdog_timer.data = (unsigned long)dev;
|
|
|
|
- lp->watchdog_timer.function = (void *)&pcnet32_watchdog;
|
|
|
|
|
|
+ setup_timer(&lp->watchdog_timer, (void *)&pcnet32_watchdog,
|
|
|
|
+ (unsigned long)dev);
|
|
|
|
|
|
/* The PCNET32-specific entries in the device structure. */
|
|
/* The PCNET32-specific entries in the device structure. */
|
|
dev->netdev_ops = &pcnet32_netdev_ops;
|
|
dev->netdev_ops = &pcnet32_netdev_ops;
|