b=17671

[fs/lustre-release.git] / lustre / kernel_patches / kernel_configs / kernel-2.6.18-2.6-rhel5-x86_64.config

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config
index aef7183..1989337 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config
@@ -1420,7 +1420,7 @@ CONFIG_QLA3XXX=m
 # Ethernet (10000 Mbit)
 #
 CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T3=m
+# CONFIG_CHELSIO_T3 is not set
 CONFIG_IXGBE=m
 CONFIG_IXGB=m
 CONFIG_IXGB_NAPI=y
@@ -1431,8 +1431,7 @@ CONFIG_ENIC=m
 CONFIG_NETXEN_NIC=m
 CONFIG_NIU=m
 CONFIG_BNX2X=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
+# CONFIG_MLX4_CORE is not set
 
 #
 # Token Ring devices
@@ -2648,33 +2647,7 @@ CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_TIMER=m
 CONFIG_LEDS_TRIGGER_IDE_DISK=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_INFINIBAND=m
-CONFIG_INFINIBAND_USER_MAD=m
-CONFIG_INFINIBAND_USER_ACCESS=m
-CONFIG_INFINIBAND_USER_MEM=y
-CONFIG_INFINIBAND_ADDR_TRANS=y
-CONFIG_INFINIBAND_MTHCA=m
-CONFIG_INFINIBAND_MTHCA_DEBUG=y
-CONFIG_INFINIBAND_IPATH=m
-CONFIG_INFINIBAND_AMSO1100=m
-# CONFIG_INFINIBAND_AMSO1100_DEBUG is not set
-CONFIG_INFINIBAND_CXGB3=m
-# CONFIG_INFINIBAND_CXGB3_DEBUG is not set
-CONFIG_INFINIBAND_NES=m
-# CONFIG_INFINIBAND_NES_DEBUG is not set
-CONFIG_MLX4_INFINIBAND=m
-CONFIG_INFINIBAND_IPOIB=m
-CONFIG_INFINIBAND_IPOIB_CM=y
-CONFIG_INFINIBAND_IPOIB_DEBUG=y
-# CONFIG_INFINIBAND_IPOIB_DEBUG_DATA is not set
-CONFIG_INFINIBAND_SRP=m
-CONFIG_INFINIBAND_ISER=m
-CONFIG_INFINIBAND_SDP=m
-# CONFIG_INFINIBAND_SDP_DEBUG is not set
-CONFIG_INFINIBAND_QLGC_VNIC=m
-# CONFIG_INFINIBAND_QLGC_VNIC_DEBUG is not set
-CONFIG_INFINIBAND_QLGC_VNIC_STATS=y
-CONFIG_INFINIBAND_MADEYE=m
+# CONFIG_INFINIBAND is not set
 
 #
 # EDAC - error detection and reporting (RAS) (EXPERIMENTAL)