From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Wed, 10 Aug 2005 12:16:23 +0000 (+0000)
Subject: leave GRE/PPTP support until it has been fixed
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~172
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=78809516354ae56fee97a9078d7075348fc9fcb8;p=linux-2.6.git

leave GRE/PPTP support until it has been fixed
---

diff --git a/configs/kernel-2.6.12-i686-planetlab.config b/configs/kernel-2.6.12-i686-planetlab.config
index fb9056345..65bbd958e 100644
--- a/configs/kernel-2.6.12-i686-planetlab.config
+++ b/configs/kernel-2.6.12-i686-planetlab.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-1.1398_FC4.0.planetlab.2005.08.08
-# Tue Aug  9 13:24:51 2005
+# Linux kernel version: 2.6.12-1.1398_FC4.0.planetlab.2005.08.10
+# Wed Aug 10 08:15:30 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -623,11 +623,8 @@ CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 # CONFIG_IP_NF_COMPAT_IPCHAINS is not set
 # CONFIG_IP_NF_COMPAT_IPFWADM is not set
-CONFIG_IP_NF_CT_PROTO_GRE=m
-CONFIG_IP_NF_PPTP=m
-CONFIG_IP_NF_NAT_PPTP=m
-CONFIG_IP_NF_NAT_PROTO_GRE=m
-CONFIG_VNET=m
+# CONFIG_IP_NF_CT_PROTO_GRE is not set
+# CONFIG_VNET is not set
 
 #
 # SCTP Configuration (EXPERIMENTAL)