land b1_4_bug5025 on b1_4

[fs/lustre-release.git] / lustre / kernel_patches / kernel_configs / kernel-2.4.21-rhel-2.4-ia64-smp.config

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64-smp.config
index a8afabf..894ec7f 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64-smp.config
@@ -716,6 +716,17 @@ CONFIG_YELLOWFIN=m
 CONFIG_R8169=m
 CONFIG_SK98LIN=m
 CONFIG_TIGON3=m
+
+#
+# Quadrics QsNet device support
+#
+CONFIG_QSNET=m
+CONFIG_ELAN3=m
+CONFIG_ELAN4=m
+CONFIG_EP=m
+CONFIG_EIP=m
+CONFIG_RMS=m
+CONFIG_JTAG=m
 # CONFIG_FDDI is not set
 # CONFIG_NETCONSOLE is not set
 # CONFIG_HIPPI is not set
@@ -1110,12 +1121,11 @@ CONFIG_FB_VOODOO1=m
 # CONFIG_FB_TRIDENT is not set
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FBCON_ADVANCED is not set
-CONFIG_FBCON_CFB8=y
-CONFIG_FBCON_CFB16=y
-CONFIG_FBCON_CFB24=y
-CONFIG_FBCON_CFB32=y
+CONFIG_FBCON_CFB8=m
+CONFIG_FBCON_CFB16=m
+CONFIG_FBCON_CFB24=m
+CONFIG_FBCON_CFB32=m
 CONFIG_FBCON_VGA_PLANES=m
-CONFIG_FBCON_HGA=m
 # CONFIG_FBCON_FONTWIDTH8_ONLY is not set
 # CONFIG_FBCON_FONTS is not set
 CONFIG_FONT_8x8=y