diff --git a/[refs] b/[refs] index 2b6112c1d642..00d2e13d6d94 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f54d9e8d7f7dd60f26157c12acda3fc94fcd9ab7 +refs/heads/master: 6048126440dcb3ba01316f961465c0ff5a255dd1 diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index bc747e5d7138..03cd7551a7a1 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -699,7 +699,6 @@ extern int dev_hard_start_xmit(struct sk_buff *skb, extern void dev_init(void); -extern int netdev_nit; extern int netdev_budget; /* Called by rtnetlink.c:rtnl_unlock() */ diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c index aa8454901719..f1c52cbd6ef7 100644 --- a/trunk/net/core/dev.c +++ b/trunk/net/core/dev.c @@ -230,7 +230,7 @@ extern void netdev_unregister_sysfs(struct net_device *); * For efficiency */ -int netdev_nit; +static int netdev_nit; /* * Add a protocol ID to the list. Now that the input handler is