diff --git a/[refs] b/[refs] index ed35c2adde20..7bc9c8ed1072 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 10badc215493a435e2dbdc691386f2650a1778de +refs/heads/master: 0761be4f5f9efb5f72a5f9771f2ed5845a974c46 diff --git a/trunk/drivers/net/via-rhine.c b/trunk/drivers/net/via-rhine.c index 53dfc8c7525b..6a23964c1317 100644 --- a/trunk/drivers/net/via-rhine.c +++ b/trunk/drivers/net/via-rhine.c @@ -1092,7 +1092,7 @@ static void rhine_check_media(struct net_device *dev, unsigned int init_media) } /* Called after status of force_media possibly changed */ -void rhine_set_carrier(struct mii_if_info *mii) +static void rhine_set_carrier(struct mii_if_info *mii) { if (mii->force_media) { /* autoneg is off: Link is always assumed to be up */