diff --git a/[refs] b/[refs] index 97ee2f94db94..70659e37ee14 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 310928d9633b04866a47f07eb43c498b2d82ebcb +refs/heads/master: 1675c7b254cd37cb58921abd95cdfef36ae82059 diff --git a/trunk/net/ipv6/addrconf.c b/trunk/net/ipv6/addrconf.c index 348bd8d06112..1bd8d818f8e9 100644 --- a/trunk/net/ipv6/addrconf.c +++ b/trunk/net/ipv6/addrconf.c @@ -4288,8 +4288,4 @@ void __exit addrconf_cleanup(void) del_timer(&addr_chk_timer); rtnl_unlock(); - -#ifdef CONFIG_PROC_FS - proc_net_remove(&init_net, "if_inet6"); -#endif }