X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab-2.6.27-i686.config;h=8285e2f1bc90596ea1728541f218537ba48c6fda;hb=8f45c518e563d92db980447e1e3bb96e68765abe;hp=f31922f17c97a1027f600964319f007daf2be7d2;hpb=50bec55ca2a1501f25012a8d2b0093d648da1f16;p=linux-2.6.git

diff --git a/planetlab-2.6.27-i686.config b/planetlab-2.6.27-i686.config
index f31922f17..8285e2f1b 100644
--- a/planetlab-2.6.27-i686.config
+++ b/planetlab-2.6.27-i686.config
@@ -1101,8 +1101,8 @@ CONFIG_MACINTOSH_DRIVERS=y
 CONFIG_MAC_EMUMOUSEBTN=y
 CONFIG_NETDEVICES=y
 CONFIG_IFB=m
-CONFIG_EGRE=m
 CONFIG_DUMMY=m
+CONFIG_EGRE=m
 CONFIG_BONDING=m
 CONFIG_MACVLAN=y
 CONFIG_EQUALIZER=m
@@ -1218,6 +1218,7 @@ CONFIG_E1000=m
 CONFIG_E1000E=m
 # CONFIG_IP1000 is not set
 CONFIG_IGB=m
+# CONFIG_IGB_LRO is not set
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m
 CONFIG_YELLOWFIN=m
@@ -2277,7 +2278,7 @@ CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 # CONFIG_SECURITY_FILE_CAPABILITIES is not set
 # CONFIG_SECURITY_ROOTPLUG is not set
-CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 # CONFIG_SECURITY_SMACK is not set
 CONFIG_XOR_BLOCKS=m
 CONFIG_ASYNC_CORE=m