diff --git a/[refs] b/[refs] index 277489314f9e..351d9b323a46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f33780d33f8a95fe5dc72b706a4de741e9240f36 +refs/heads/master: d785ad74641c59074786084b24a9283d7a7727b0 diff --git a/trunk/drivers/net/sis190.c b/trunk/drivers/net/sis190.c index 2e9e88be7b33..202fdf356621 100644 --- a/trunk/drivers/net/sis190.c +++ b/trunk/drivers/net/sis190.c @@ -1630,7 +1630,8 @@ static inline void sis190_init_rxfilter(struct net_device *dev) SIS_PCI_COMMIT(); } -static int sis190_get_mac_addr(struct pci_dev *pdev, struct net_device *dev) +static int __devinit sis190_get_mac_addr(struct pci_dev *pdev, + struct net_device *dev) { u8 from;