From 950a21515e52289820f5597b0f0a6eb751966702 Mon Sep 17 00:00:00 2001
From: Rami Rosen <ramirose@gmail.com>
Date: Mon, 9 Jun 2008 16:00:22 -0700
Subject: [PATCH] --- yaml --- r: 102707 b: refs/heads/master c:
 7bcd978e8cf2a1a9502d454cd2f80f9834e82610 h: refs/heads/master i:   102705:
 1b3d33a6c5f179fb0a592619a6746fe89517d288   102703:
 f794ab04ed5cd59d45e9a0a2940181b62cd4fb19 v: v3

---
 [refs]                                               | 2 +-
 trunk/include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d90b2a25de66..805537c9a509 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e57dce60c7478fdeeb9a1ebd311261ec901afe4d
+refs/heads/master: 7bcd978e8cf2a1a9502d454cd2f80f9834e82610
diff --git a/trunk/include/net/netfilter/ipv4/nf_conntrack_ipv4.h b/trunk/include/net/netfilter/ipv4/nf_conntrack_ipv4.h
index 9bf059817aec..7573d52a4346 100644
--- a/trunk/include/net/netfilter/ipv4/nf_conntrack_ipv4.h
+++ b/trunk/include/net/netfilter/ipv4/nf_conntrack_ipv4.h
@@ -9,8 +9,6 @@
 #ifndef _NF_CONNTRACK_IPV4_H
 #define _NF_CONNTRACK_IPV4_H
 
-/* Returns new sk_buff, or NULL */
-struct sk_buff *nf_ct_ipv4_ct_gather_frags(struct sk_buff *skb);
 
 extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4;