---

yaml --- r: 236568 b: refs/heads/master c: 03c0e5b h: refs/heads/master v: v3
git-mirror · Nov 15, 2010 · 8aae876 · 8aae876
1 parent 9175483
commit 8aae876
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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;