diff --git a/[refs] b/[refs] index f78ccb7eb736..780b2af73ebc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4a15d56f78936ec15a5d747546f25ace8fef9a03 +refs/heads/master: 98712e5e3325247bf22a175d225526c9d5f8439b diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c index 393ee635b6c4..ce1a8afc3313 100644 --- a/trunk/drivers/net/sky2.c +++ b/trunk/drivers/net/sky2.c @@ -2219,7 +2219,7 @@ static inline u32 sky2_clk2us(const struct sky2_hw *hw, u32 clk) } -static int sky2_reset(struct sky2_hw *hw) +static int __devinit sky2_reset(struct sky2_hw *hw) { u16 status; u8 t8, pmd_type;