From 8874b7912067f5ecd784f11a1ab5a7bc7d470745 Mon Sep 17 00:00:00 2001 From: brian Date: Mon, 5 Dec 2005 18:14:40 +0000 Subject: [PATCH] Remove duplicated and conflicting options. --- .../kernel_configs/kernel-2.6.5-2.6-suse-x86_64-smp.config | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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 8ceac36..c455f9d 100644 --- 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 @@ -610,7 +610,7 @@ CONFIG_IEEE1394_OHCI1394=m # CONFIG_IEEE1394_VIDEO1394=m CONFIG_IEEE1394_SBP2=m -# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set +CONFIG_IEEE1394_SBP2_PHYS_DMA=y CONFIG_IEEE1394_ETH1394=m CONFIG_IEEE1394_DV1394=m CONFIG_IEEE1394_RAWIO=m @@ -2470,8 +2470,3 @@ CONFIG_ZLIB_DEFLATE=m CONFIG_SUSE_KERNEL=y CONFIG_CFGNAME="smp" CONFIG_RELEASE="SLES9_SP1_BRANCH_2004111114454891" -CONFIG_IEEE1394=m -CONFIG_IEEE1394_PCILYNX=m -CONFIG_IEEE1394_OHCI1394=y -CONFIG_IEEE1394_SBP2=m -CONFIG_IEEE1394_SBP2_PHYS_DMA=y -- 1.8.3.1