From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Fri, 4 Mar 2005 14:09:10 +0000 (+0000)
Subject: - merge revision 1.2 of configs/kernel-2.6.9-i686-planetlab.config
X-Git-Tag: planetlab-3_0-rc13~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d299678a2cc41ab099fde62ef2e3f6d8f17efafd;p=linux-2.6.git

- merge revision 1.2 of configs/kernel-2.6.9-i686-planetlab.config
date: 2005/02/01 03:58:41;  author: mlhuang;  state: Exp;  lines: +2 -1
enable CONFIG_VNET
---

diff --git a/configs/kernel-2.6.8-i686-planetlab.config b/configs/kernel-2.6.8-i686-planetlab.config
index 3e2bddda0..49234b512 100644
--- a/configs/kernel-2.6.8-i686-planetlab.config
+++ b/configs/kernel-2.6.8-i686-planetlab.config
@@ -545,6 +545,7 @@ 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
 
 #
 # SCTP Configuration (EXPERIMENTAL)