diff --git a/[refs] b/[refs] index 8806354060f1..fec86a900a9f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db94ce90d3d571c11637a912cc39cfb80df3879c +refs/heads/master: 5ee6f6a17cfde9c3141e4d57cf88b5cdf638b463 diff --git a/trunk/drivers/net/phy/broadcom.c b/trunk/drivers/net/phy/broadcom.c index f63c96a4ecb4..c13cf64095b6 100644 --- a/trunk/drivers/net/phy/broadcom.c +++ b/trunk/drivers/net/phy/broadcom.c @@ -326,7 +326,8 @@ static int bcm54xx_phydsp_config(struct phy_device *phydev) static void bcm54xx_adjust_rxrefclk(struct phy_device *phydev) { - u32 val, orig; + u32 orig; + int val; bool clk125en = true; /* Abort if we are using an untested phy. */