From 0e144b785fa3d4372d8c90805f84b4b364bb4ca8 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Thu, 20 Nov 2008 10:01:37 +0100
Subject: [PATCH] --- yaml --- r: 122380 b: refs/heads/master c:
 56bc0f9603e45cf13db51e554e1541e289a7f8e9 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/net/netfilter/nf_conntrack_proto_gre.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index aa66c36b35f4..0d2b1f96728c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 61d3015808d877eb4ea225b5924feb128b0c1bc7
+refs/heads/master: 56bc0f9603e45cf13db51e554e1541e289a7f8e9
diff --git a/trunk/net/netfilter/nf_conntrack_proto_gre.c b/trunk/net/netfilter/nf_conntrack_proto_gre.c
index 4ab62ad85dd4..1b279f9d6bf3 100644
--- a/trunk/net/netfilter/nf_conntrack_proto_gre.c
+++ b/trunk/net/netfilter/nf_conntrack_proto_gre.c
@@ -341,7 +341,7 @@ static int __init nf_ct_proto_gre_init(void)
 	return rv;
 }
 
-static void nf_ct_proto_gre_fini(void)
+static void __exit nf_ct_proto_gre_fini(void)
 {
 	nf_conntrack_l4proto_unregister(&nf_conntrack_l4proto_gre4);
 	unregister_pernet_gen_subsys(proto_gre_net_id, &proto_gre_net_ops);