[PATCH] Fix function/macro name collision on i386 oprofile

[linux-2.6] / net / ipv6 / ip6_tunnel.c

diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
index f39ddeae1eefbf80fe92d63d91bfd7f83e11f6ac..09613729404cfaa6b7dc7e7ee13e33f0aa300111 100644 (file)
--- a/net/ipv6/ip6_tunnel.c
+++ b/net/ipv6/ip6_tunnel.c
@@ -1123,7 +1123,7 @@ static inline int ip6ip6_register(void)
 
 static inline int ip6ip6_unregister(void)
 {
-       return xfrm6_tunnel_unregister(&ip6ip6_handler);
+       return xfrm6_tunnel_deregister(&ip6ip6_handler);
 }
 #else
 static struct inet6_protocol xfrm6_tunnel_protocol = {