diff --git a/[refs] b/[refs] index a56625925477..0b1e541d9618 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1459bb36b12ac52bde68d70e2ba7a6f1f2e8be17 +refs/heads/master: 89c89458152c4d387eeca6532b6e50780fc59f8b diff --git a/trunk/include/net/ipip.h b/trunk/include/net/ipip.h index 84058858eea7..7cdc914322f0 100644 --- a/trunk/include/net/ipip.h +++ b/trunk/include/net/ipip.h @@ -44,8 +44,4 @@ struct ip_tunnel } \ } while (0) - -extern int sit_init(void); -extern void sit_cleanup(void); - #endif diff --git a/trunk/net/ipv6/sit.c b/trunk/net/ipv6/sit.c index 85ff3dc45148..77b7b0911438 100644 --- a/trunk/net/ipv6/sit.c +++ b/trunk/net/ipv6/sit.c @@ -809,7 +809,7 @@ static void __exit sit_destroy_tunnels(void) } } -void __exit sit_cleanup(void) +static void __exit sit_cleanup(void) { inet_del_protocol(&sit_protocol, IPPROTO_IPV6); @@ -819,7 +819,7 @@ void __exit sit_cleanup(void) rtnl_unlock(); } -int __init sit_init(void) +static int __init sit_init(void) { int err;