From 7f6a4a3b9fa3e4d0ed6864a26fdfe4aa43677ec2 Mon Sep 17 00:00:00 2001
From: Yasuyuki Kozakai <yasuyuki.kozakai@toshiba.co.jp>
Date: Tue, 5 Dec 2006 13:44:31 -0800
Subject: [PATCH] --- yaml --- r: 43171 b: refs/heads/master c:
 9ee0779e994c6916863045297b831212e285da3b h: refs/heads/master i:   43169:
 c105970aa1d924bc76fdeb1afe701af37a7b9761   43167:
 e1b981dbea59e3ac9ba30cf65e439e1ef9f5f22a v: v3

---
 [refs]                                            | 2 +-
 trunk/include/linux/netfilter/nf_conntrack_pptp.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 49ea6cb7fcb6..88cfeb544b0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6677f4312ee74f8ca68c4cc4060465607b72b41
+refs/heads/master: 9ee0779e994c6916863045297b831212e285da3b
diff --git a/trunk/include/linux/netfilter/nf_conntrack_pptp.h b/trunk/include/linux/netfilter/nf_conntrack_pptp.h
index fb049ec11ff2..9d8144a488cd 100644
--- a/trunk/include/linux/netfilter/nf_conntrack_pptp.h
+++ b/trunk/include/linux/netfilter/nf_conntrack_pptp.h
@@ -2,6 +2,8 @@
 #ifndef _NF_CONNTRACK_PPTP_H
 #define _NF_CONNTRACK_PPTP_H
 
+#include <linux/netfilter/nf_conntrack_common.h>
+
 /* state of the control session */
 enum pptp_ctrlsess_state {
 	PPTP_SESSION_NONE,			/* no session present */
@@ -295,7 +297,6 @@ union pptp_ctrl_union {
 /* crap needed for nf_conntrack_compat.h */
 struct nf_conn;
 struct nf_conntrack_expect;
-enum ip_conntrack_info;
 
 extern int
 (*nf_nat_pptp_hook_outbound)(struct sk_buff **pskb,