Build firewire as a module rather than staticly.

Rearrange and remove duplicate options in the rhel3-x86_64 kernel to match
what make oldconfig will do.

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.20-hp_pnnl-2.4-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.20-hp_pnnl-2.4-ia64-smp.config
index 1402ebe..6f80390 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.20-hp_pnnl-2.4-ia64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.20-hp_pnnl-2.4-ia64-smp.config
@@ -1040,7 +1040,7 @@ CONFIG_IA64_EARLY_PRINTK_UART_BASE=0
 # CONFIG_IA64_DEBUG_CMPXCHG is not set
 # CONFIG_IA64_DEBUG_IRQ is not set
 CONFIG_KALLSYMS=y
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.20-hp_pnnl-2.4-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.20-hp_pnnl-2.4-ia64.config
index b612ad9..ad824dc 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.20-hp_pnnl-2.4-ia64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.20-hp_pnnl-2.4-ia64.config
@@ -1040,7 +1040,7 @@ CONFIG_IA64_EARLY_PRINTK_UART_BASE=0
 # CONFIG_IA64_DEBUG_CMPXCHG is not set
 # CONFIG_IA64_DEBUG_IRQ is not set
 CONFIG_KALLSYMS=y
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i686-smp.config
index cc067ed..1f73e74 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i686-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i686-smp.config
@@ -1864,7 +1864,7 @@ CONFIG_FRAME_POINTER=y
 #
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i686.config
index cc067ed..1f73e74 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i686.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.20-rh-2.4-i686.config
@@ -1864,7 +1864,7 @@ CONFIG_FRAME_POINTER=y
 #
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config
index e60bdeb..963dfb3 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686-smp.config
@@ -2130,7 +2130,7 @@ CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_QSORT=y
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686.config
index e60bdeb..963dfb3 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686.config
@@ -2130,7 +2130,7 @@ CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_QSORT=y
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

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 53b1ff8..075f2ab 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
@@ -1442,7 +1442,7 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_IA64_DEBUG_CMPXCHG is not set
 # CONFIG_IA64_DEBUG_IRQ is not set
 CONFIG_KALLSYMS=y
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64.config
index 53b1ff8..075f2ab 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64.config
@@ -1442,7 +1442,7 @@ CONFIG_MAGIC_SYSRQ=y
 # CONFIG_IA64_DEBUG_CMPXCHG is not set
 # CONFIG_IA64_DEBUG_IRQ is not set
 CONFIG_KALLSYMS=y
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config
index 8869f1c..c650a84 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64-smp.config
@@ -1777,8 +1777,3 @@ CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_QSORT=y
-CONFIG_IEEE1394=y
-CONFIG_IEEE1394_PCILYNX=m
-CONFIG_IEEE1394_OHCI1394=y
-CONFIG_IEEE1394_SBP2=m
-CONFIG_IEEE1394_SBP2_PHYS_DMA=y

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64.config
index 8869f1c..4198381 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64.config
@@ -1777,7 +1777,7 @@ CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_QSORT=y
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-sles-2.4-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-sles-2.4-i686-smp.config
index 620e408..29aec31 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-sles-2.4-i686-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-sles-2.4-i686-smp.config
@@ -2381,7 +2381,7 @@ CONFIG_FW_LOADER=m
 CONFIG_UNITEDLINUX_KERNEL=y
 CONFIG_CFGNAME="smp"
 CONFIG_RELEASE="273"
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-sles-2.4-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-sles-2.4-i686.config
index 620e408..29aec31 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-sles-2.4-i686.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-sles-2.4-i686.config
@@ -2381,7 +2381,7 @@ CONFIG_FW_LOADER=m
 CONFIG_UNITEDLINUX_KERNEL=y
 CONFIG_CFGNAME="smp"
 CONFIG_RELEASE="273"
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-suse-2.4.21-2-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-suse-2.4.21-2-x86_64.config
index 3081ac9..eb8bd68 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-suse-2.4.21-2-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-suse-2.4.21-2-x86_64.config
@@ -2039,7 +2039,7 @@ CONFIG_FW_LOADER=m
 CONFIG_SUSE_KERNEL=y
 CONFIG_CFGNAME="default"
 CONFIG_RELEASE=171
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-bigsmp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-bigsmp.config
index ddc4ff8..feb904e 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-bigsmp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-bigsmp.config
@@ -2866,7 +2866,7 @@ CONFIG_X86_HT=y
 CONFIG_X86_BIOS_REBOOT=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_PC=y
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-smp.config
index ddc4ff8..feb904e 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686-smp.config
@@ -2866,7 +2866,7 @@ CONFIG_X86_HT=y
 CONFIG_X86_BIOS_REBOOT=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_PC=y
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686.config
index ddc4ff8..feb904e 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-i686.config
@@ -2866,7 +2866,7 @@ CONFIG_X86_HT=y
 CONFIG_X86_BIOS_REBOOT=y
 CONFIG_X86_TRAMPOLINE=y
 CONFIG_PC=y
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64-smp.config
index 50694f2..35e4a3a 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64-smp.config
@@ -2389,7 +2389,7 @@ CONFIG_CRYPTO_TEST=m
 CONFIG_SUSE_KERNEL=y
 CONFIG_CFGNAME="default"
 CONFIG_RELEASE="0"
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64.config
index 50694f2..35e4a3a 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ia64.config
@@ -2389,7 +2389,7 @@ CONFIG_CRYPTO_TEST=m
 CONFIG_SUSE_KERNEL=y
 CONFIG_CFGNAME="default"
 CONFIG_RELEASE="0"
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ppc-pseries64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ppc-pseries64.config
index ed94c0b..853c6b8 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ppc-pseries64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ppc-pseries64.config
@@ -1450,7 +1450,7 @@ CONFIG_ZLIB_DEFLATE=m
 CONFIG_SUSE_KERNEL=y
 CONFIG_CFGNAME="pseries64"
 CONFIG_RELEASE="7.141"
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ppc.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ppc.config
index 8fccbb0..4385809 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ppc.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-ppc.config
@@ -1449,7 +1449,7 @@ CONFIG_ZLIB_DEFLATE=m
 CONFIG_SUSE_KERNEL=y
 CONFIG_CFGNAME="pseries64"
 CONFIG_RELEASE="SLES9_SP1_BRANCH_91"
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config
index 311fb63..8ceac36 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config
@@ -2470,7 +2470,7 @@ CONFIG_ZLIB_DEFLATE=m
 CONFIG_SUSE_KERNEL=y
 CONFIG_CFGNAME="smp"
 CONFIG_RELEASE="SLES9_SP1_BRANCH_2004111114454891"
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64.config
index 311fb63..8ceac36 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.5-2.6-suse-x86_64.config
@@ -2470,7 +2470,7 @@ CONFIG_ZLIB_DEFLATE=m
 CONFIG_SUSE_KERNEL=y
 CONFIG_CFGNAME="smp"
 CONFIG_RELEASE="SLES9_SP1_BRANCH_2004111114454891"
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config
index 3518e3c..1e322fa 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686-smp.config
@@ -666,7 +666,7 @@ CONFIG_FUSION_LAN=m
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 
 #
 # Subsystem Options

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config
index 5bdefea..25a3848 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-i686.config
@@ -666,7 +666,7 @@ CONFIG_FUSION_LAN=m
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 
 #
 # Subsystem Options

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config
index 69c619b..8f47f60 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64-smp.config
@@ -1929,7 +1929,7 @@ CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_SIGNATURE=y
 CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_MPILIB=y
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config
index 7391f28..eec380f 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-ia64.config
@@ -1929,7 +1929,7 @@ CONFIG_CRYPTO_CRC32C=m
 CONFIG_CRYPTO_SIGNATURE=y
 CONFIG_CRYPTO_SIGNATURE_DSA=y
 CONFIG_CRYPTO_MPILIB=y
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=y
 CONFIG_IEEE1394_SBP2=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config
index ca558d6..c34fa7f 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64-smp.config
@@ -547,7 +547,7 @@ CONFIG_FUSION_LAN=m
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 
 #
 # Subsystem Options

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config
index 22f6a99..8a1b02f 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.9-2.6-rhel4-x86_64.config
@@ -547,7 +547,7 @@ CONFIG_FUSION_LAN=m
 #
 # IEEE 1394 (FireWire) support
 #
-CONFIG_IEEE1394=y
+CONFIG_IEEE1394=m
 
 #
 # Subsystem Options