diff --git a/[refs] b/[refs]
index fab764c6e0c1..5ef7437586c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffa934f192c8381061242eb170419266ef229902
+refs/heads/master: bb134d2298b49f50cf6d9388410fba96272905dc
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 2730352d2ccc..47d3d78d5416 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -1605,7 +1605,7 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
  * expected that drivers will fix this mapping if they can before
  * calling netif_set_real_num_tx_queues.
  */
-void netif_setup_tc(struct net_device *dev, unsigned int txq)
+static void netif_setup_tc(struct net_device *dev, unsigned int txq)
 {
 	int i;
 	struct netdev_tc_txq *tc = &dev->tc_to_txq[0];