diff options
Diffstat (limited to 'drivers/net/tulip')
-rw-r--r-- | drivers/net/tulip/tulip_core.c | 2 | ||||
-rw-r--r-- | drivers/net/tulip/winbond-840.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index 2034baf5a2bb..0a339dff014e 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c | |||
@@ -1545,7 +1545,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, | |||
1545 | if (pcp) { | 1545 | if (pcp) { |
1546 | unsigned char *addr; | 1546 | unsigned char *addr; |
1547 | int len; | 1547 | int len; |
1548 | 1548 | ||
1549 | addr = of_get_property(pcp->prom_node, | 1549 | addr = of_get_property(pcp->prom_node, |
1550 | "local-mac-address", &len); | 1550 | "local-mac-address", &len); |
1551 | if (addr && len == 6) | 1551 | if (addr && len == 6) |
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 0e5344fe7e26..264723b592cf 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
@@ -1602,7 +1602,7 @@ static int w840_suspend (struct pci_dev *pdev, pm_message_t state) | |||
1602 | 1602 | ||
1603 | synchronize_irq(dev->irq); | 1603 | synchronize_irq(dev->irq); |
1604 | netif_tx_disable(dev); | 1604 | netif_tx_disable(dev); |
1605 | 1605 | ||
1606 | np->stats.rx_missed_errors += ioread32(ioaddr + RxMissed) & 0xffff; | 1606 | np->stats.rx_missed_errors += ioread32(ioaddr + RxMissed) & 0xffff; |
1607 | 1607 | ||
1608 | /* no more hardware accesses behind this line. */ | 1608 | /* no more hardware accesses behind this line. */ |