X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab-2.6.22-i686.config;h=ab7067c64f6337ce3d2b0c3f34f2a17723b4876c;hb=77d033fed7f38267b9d06a1cb85a28b741aaf5c9;hp=8d743c34cfef9f74f6cc74442342ad5f595ca376;hpb=fd7b221c7c8f55e58e01c20b16b5a01df928e242;p=linux-2.6.git

diff --git a/planetlab-2.6.22-i686.config b/planetlab-2.6.22-i686.config
index 8d743c34c..ab7067c64 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
@@ -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