diff options
| author | David S. Miller <davem@davemloft.net> | 2008-05-13 04:19:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-05-13 04:19:43 -0400 |
| commit | 99dd1a2b8347ac2ae802300b7862f6f7bcf17139 (patch) | |
| tree | 4f583715a29ac95723b85532f47c3c568a544f1d /drivers/net/sis190.c | |
| parent | 7ef43ebaa538e0cc9063cbf84593a05091bcace2 (diff) | |
| parent | 7d2e3cb7000b883a8e489485ac249be572fe17b1 (diff) | |
Merge branch 'upstream-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/sis190.c')
| -rw-r--r-- | drivers/net/sis190.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index abc63b0663be..3fe01763760e 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c | |||
| @@ -1656,7 +1656,7 @@ static inline void sis190_init_rxfilter(struct net_device *dev) | |||
| 1656 | SIS_PCI_COMMIT(); | 1656 | SIS_PCI_COMMIT(); |
| 1657 | } | 1657 | } |
| 1658 | 1658 | ||
| 1659 | static int __devinit sis190_get_mac_addr(struct pci_dev *pdev, | 1659 | static int __devinit sis190_get_mac_addr(struct pci_dev *pdev, |
| 1660 | struct net_device *dev) | 1660 | struct net_device *dev) |
| 1661 | { | 1661 | { |
| 1662 | int rc; | 1662 | int rc; |