diff --git a/[refs] b/[refs]
index 636ebbe32e2f..578649574706 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f9586f79bf6125ae28fab9f585094c56e8740e83
+refs/heads/master: de93cb2eaffd6d3e44bc738babfac35769d79720
diff --git a/trunk/net/8021q/vlan_dev.c b/trunk/net/8021q/vlan_dev.c
index 039013923a74..9988d4abb372 100644
--- a/trunk/net/8021q/vlan_dev.c
+++ b/trunk/net/8021q/vlan_dev.c
@@ -664,12 +664,12 @@ static struct rtnl_link_stats64 *vlan_dev_get_stats64(struct net_device *dev, st
 }
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
-void vlan_dev_poll_controller(struct net_device *dev)
+static void vlan_dev_poll_controller(struct net_device *dev)
 {
 	return;
 }
 
-int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *npinfo)
+static int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *npinfo)
 {
 	struct vlan_dev_priv *info = vlan_dev_priv(dev);
 	struct net_device *real_dev = info->real_dev;
@@ -696,7 +696,7 @@ int vlan_dev_netpoll_setup(struct net_device *dev, struct netpoll_info *npinfo)
 	return err;
 }
 
-void vlan_dev_netpoll_cleanup(struct net_device *dev)
+static void vlan_dev_netpoll_cleanup(struct net_device *dev)
 {
 	struct vlan_dev_priv *info = vlan_dev_priv(dev);
 	struct netpoll *netpoll = info->netpoll;