diff --git a/[refs] b/[refs] index 59a5bae46292..3c42a02bc2f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 92aa674d721d089c440301ab95cb6be19c78727e +refs/heads/master: c7985051dec26dc5ae2562a975a0b37b70621f3f diff --git a/trunk/drivers/net/forcedeth.c b/trunk/drivers/net/forcedeth.c index 62b38a4494b8..191383d461d7 100644 --- a/trunk/drivers/net/forcedeth.c +++ b/trunk/drivers/net/forcedeth.c @@ -2076,7 +2076,7 @@ static void nv_set_multicast(struct net_device *dev) spin_unlock_irq(&np->lock); } -void nv_update_pause(struct net_device *dev, u32 pause_flags) +static void nv_update_pause(struct net_device *dev, u32 pause_flags) { struct fe_priv *np = netdev_priv(dev); u8 __iomem *base = get_hwbase(dev);