X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab-2.6.22-i686.config;h=b1e6f0efc332a2bc0cb94585cf1c03e4f198c832;hb=27801912f5740b4a149e99da606b68cf79e6d3b8;hp=8d743c34cfef9f74f6cc74442342ad5f595ca376;hpb=859838183e41aeca1602f0fe8c54c59104faf135;p=linux-2.6.git

diff --git a/planetlab-2.6.22-i686.config b/planetlab-2.6.22-i686.config
index 8d743c34c..b1e6f0efc 100644
--- a/planetlab-2.6.22-i686.config
+++ b/planetlab-2.6.22-i686.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.22.18-vs2.3.0.32
-# Fri Mar 21 18:03:12 2008
+# Linux kernel version: 2.6.22.19-vs2.3.0.34.39.coblitz.2009.07.17
+# Fri Jul 17 00:38:01 2009
 #
 CONFIG_X86_32=y
 CONFIG_GENERIC_TIME=y
@@ -370,7 +370,11 @@ CONFIG_ASK_IP_FIB_HASH=y
 CONFIG_IP_FIB_HASH=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_ROUTE_MULTIPATH=y
-# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
+CONFIG_IP_ROUTE_MULTIPATH_CACHED=y
+CONFIG_IP_ROUTE_MULTIPATH_RR=y
+CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m
+CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m
+CONFIG_IP_ROUTE_MULTIPATH_DRR=m
 CONFIG_IP_ROUTE_VERBOSE=y
 # CONFIG_IP_PNP is not set
 CONFIG_NET_IPIP=m
@@ -412,13 +416,7 @@ CONFIG_DEFAULT_CUBIC=y
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="cubic"
 CONFIG_TCP_MD5SIG=y
-CONFIG_WEB100=y
-CONFIG_WEB100_STATS=y
-CONFIG_WEB100_FPERMS=416
-CONFIG_WEB100_GID=0
-CONFIG_WEB100_UID=0
-CONFIG_WEB100_NET100=y
-CONFIG_WEB100_NETLINK=y
+# CONFIG_WEB100 is not set
 # CONFIG_IP_VS is not set
 CONFIG_ICMP_IPOD=y
 CONFIG_IPV6=y
@@ -1141,10 +1139,10 @@ CONFIG_VIA_RHINE_MMIO=y
 CONFIG_VIA_RHINE_NAPI=y
 CONFIG_SC92031=m
 CONFIG_NETDEV_1000=y
+CONFIG_IGB=m
 CONFIG_ACENIC=m
 # CONFIG_ACENIC_OMIT_TIGON_I is not set
 CONFIG_DL2K=m
-CONFIG_IGB=m
 CONFIG_E1000=m
 CONFIG_E1000_NAPI=y
 # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
@@ -1722,6 +1720,7 @@ CONFIG_USB_SERIAL=m
 # CONFIG_USB_SERIAL_MOS7720 is not set
 # CONFIG_USB_SERIAL_MOS7840 is not set
 # CONFIG_USB_SERIAL_NAVMAN is not set
+CONFIG_USB_SERIAL_PL2303=m
 # CONFIG_USB_SERIAL_HP4X is not set
 # CONFIG_USB_SERIAL_SAFE is not set
 # CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
@@ -1731,7 +1730,6 @@ CONFIG_USB_SERIAL=m
 # CONFIG_USB_SERIAL_OPTION is not set
 # CONFIG_USB_SERIAL_OMNINET is not set
 # CONFIG_USB_SERIAL_DEBUG is not set
-CONFIG_USB_SERIAL_PL2303=m
 
 #
 # USB Miscellaneous drivers