From 560310c0bd9bf1f232062d81ad61fc604f5611d4 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Mon, 29 Aug 2011 13:21:14 -0400
Subject: [PATCH] --- yaml --- r: 274595 b: refs/heads/master c:
 34641c6d003a0a94ccabf78211f42da36799f1a2 h: refs/heads/master i:   274593:
 e39a7bab896ed1a3629c5e98310224a304b8266e   274591:
 4ac8daaff41747f62c31db334d2f6a836e9c6bdb v: v3

---
 [refs]                                     | 2 +-
 trunk/include/net/netfilter/nf_conntrack.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 00e8d4bab21a..f6554b2d9f68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de47725421ad5627a5c905f4e40bb844ebc06d29
+refs/heads/master: 34641c6d003a0a94ccabf78211f42da36799f1a2
diff --git a/trunk/include/net/netfilter/nf_conntrack.h b/trunk/include/net/netfilter/nf_conntrack.h
index 0b7f05e4a927..8a2b0ae7dbd2 100644
--- a/trunk/include/net/netfilter/nf_conntrack.h
+++ b/trunk/include/net/netfilter/nf_conntrack.h
@@ -313,6 +313,8 @@ static inline bool nf_is_loopback_packet(const struct sk_buff *skb)
 	return skb->dev && skb->skb_iif && skb->dev->flags & IFF_LOOPBACK;
 }
 
+struct kernel_param;
+
 extern int nf_conntrack_set_hashsize(const char *val, struct kernel_param *kp);
 extern unsigned int nf_conntrack_htable_size;
 extern unsigned int nf_conntrack_max;