diff --git a/[refs] b/[refs]
index c58595d221ae..802c3c3026c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1841a4c7ae106b7a3e2521db55f4d8bb8a0988d5
+refs/heads/master: 279c2c74b6a26fbd8c3dc100a59c3ac0ff7559fa
diff --git a/trunk/net/ipv4/netfilter/nf_conntrack_proto_icmp.c b/trunk/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
index 0e2c448ea389..4153e0494983 100644
--- a/trunk/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
+++ b/trunk/net/ipv4/netfilter/nf_conntrack_proto_icmp.c
@@ -128,7 +128,6 @@ static int icmp_new(struct nf_conn *conntrack,
 	return 1;
 }
 
-extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4;
 /* Returns conntrack if it dealt with ICMP, and filled in skb fields */
 static int
 icmp_error_message(struct sk_buff *skb,