diff --git a/[refs] b/[refs]
index 8ee0a14f0052..57f256979c41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3dbc46c2a62688d1aaa1f7291a054fb2b502849
+refs/heads/master: 61463a30f65225e19e68f59dbd7b888bb308ec99
diff --git a/trunk/drivers/net/can/dev.c b/trunk/drivers/net/can/dev.c
index d0f8c7e67e7d..9bf1116e5b5e 100644
--- a/trunk/drivers/net/can/dev.c
+++ b/trunk/drivers/net/can/dev.c
@@ -208,7 +208,7 @@ static int can_fixup_bittiming(struct net_device *dev, struct can_bittiming *bt)
 	return 0;
 }
 
-int can_get_bittiming(struct net_device *dev, struct can_bittiming *bt)
+static int can_get_bittiming(struct net_device *dev, struct can_bittiming *bt)
 {
 	struct can_priv *priv = netdev_priv(dev);
 	int err;