diff --git a/[refs] b/[refs] index 11785c548d56..5f25d9621b20 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b06715b7a3db551dcf4706f05e8d2285a66fe05f +refs/heads/master: af8eca5cbbc8f991ec14c8d7e3350bbe2ea49655 diff --git a/trunk/drivers/net/cxgb3/vsc8211.c b/trunk/drivers/net/cxgb3/vsc8211.c index 33f956bd6b59..d07130971b8f 100644 --- a/trunk/drivers/net/cxgb3/vsc8211.c +++ b/trunk/drivers/net/cxgb3/vsc8211.c @@ -262,6 +262,7 @@ static int vsc8211_get_link_status_fiber(struct cphy *cphy, int *link_ok, return 0; } +#ifdef UNUSED /* * Enable/disable auto MDI/MDI-X in forced link speed mode. */ @@ -301,6 +302,7 @@ int vsc8211_set_speed_duplex(struct cphy *phy, int speed, int duplex) err = vsc8211_set_automdi(phy, 1); return err; } +#endif /* UNUSED */ static int vsc8211_power_down(struct cphy *cphy, int enable) {