From: brian <brian>
Date: Tue, 6 Dec 2005 17:07:13 +0000 (+0000)
Subject: Re-arrange options as make oldconfig will.
X-Git-Tag: v1_7_100~1^103~4^2~199
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=62166a78b84a4ea03a7a3df5c766e258032d4716;p=fs%2Flustre-release.git

Re-arrange options as make oldconfig will.
---

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 963dfb3..6d1a75b 100644
--- 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
@@ -727,7 +727,7 @@ CONFIG_IEEE1394=m
 #
 # Device Drivers
 #
-# CONFIG_IEEE1394_PCILYNX is not set
+CONFIG_IEEE1394_PCILYNX=m
 CONFIG_IEEE1394_OHCI1394=m
 
 #
@@ -2130,8 +2130,3 @@ CONFIG_CRC32=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_QSORT=y
-CONFIG_IEEE1394=m
-CONFIG_IEEE1394_PCILYNX=m
-CONFIG_IEEE1394_OHCI1394=y
-CONFIG_IEEE1394_SBP2=m
-CONFIG_IEEE1394_SBP2_PHYS_DMA=y