diff --git a/[refs] b/[refs] index f9cc5f8aa729..647dfff0c030 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea9f07197cae739fb22fd208a68425fea26a763b +refs/heads/master: 77fc95a356cd07d247bbe42a66596ba7b8486920 diff --git a/trunk/drivers/net/can/dev.c b/trunk/drivers/net/can/dev.c index 239e4dd92ca1..963e2ccd10db 100644 --- a/trunk/drivers/net/can/dev.c +++ b/trunk/drivers/net/can/dev.c @@ -401,7 +401,7 @@ EXPORT_SYMBOL_GPL(can_free_echo_skb); /* * CAN device restart for bus-off recovery */ -void can_restart(unsigned long data) +static void can_restart(unsigned long data) { struct net_device *dev = (struct net_device *)data; struct can_priv *priv = netdev_priv(dev);