From 8aae876a4a5edb3558f5e5c78d5d9c4e561a8bf3 Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo@gmail.com>
Date: Mon, 15 Nov 2010 12:27:27 +0100
Subject: [PATCH] --- yaml --- r: 236568 b: refs/heads/master c:
 03c0e5bb34c9755ae4d955c97fba40b24e9c7fe7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 89be1eb08dc5..12645dc2e1d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0e76c83becc7536e8371e560504d836d34fcf7d
+refs/heads/master: 03c0e5bb34c9755ae4d955c97fba40b24e9c7fe7
diff --git a/trunk/include/net/netfilter/nf_nat.h b/trunk/include/net/netfilter/nf_nat.h
index e966092a36f1..aff80b190c12 100644
--- a/trunk/include/net/netfilter/nf_nat.h
+++ b/trunk/include/net/netfilter/nf_nat.h
@@ -56,7 +56,9 @@ struct nf_nat_multi_range_compat {
 /* per conntrack: nat application helper private data */
 union nf_conntrack_nat_help {
 	/* insert nat helper private data here */
+#if defined(CONFIG_NF_NAT_PPTP) || defined(CONFIG_NF_NAT_PPTP_MODULE)
 	struct nf_nat_pptp nat_pptp_info;
+#endif
 };
 
 struct nf_conn;