merge Changeset 17951

[linux-2.6.git] / coblitz-2.6.22-i686.config

diff --git a/coblitz-2.6.22-i686.config b/coblitz-2.6.22-i686.config
index 1a0a433..90102e5 100644 (file)
--- a/coblitz-2.6.22-i686.config
+++ b/coblitz-2.6.22-i686.config
@@ -370,7 +370,7 @@ 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=y
+# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
 CONFIG_IP_ROUTE_MULTIPATH_RR=y
 CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m
 CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m
@@ -1139,7 +1139,6 @@ 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