From 2763de00721db6c725b51690e73b3e64f9c1fe6e Mon Sep 17 00:00:00 2001 From: Andres Salomon Date: Sat, 16 Jul 2005 12:50:59 +0000 Subject: [PATCH] enable CONFIG_SECCOMP for everyone; remove old NETFILTER option for everyone that're no longer used svn path=/trunk/kernel/source/linux-2.6-2.6.12/; revision=3556 --- debian/arch/amd64/config | 5 ----- debian/arch/amd64/config.default | 1 - debian/arch/config | 1 + debian/arch/i386/config | 5 ----- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/debian/arch/amd64/config b/debian/arch/amd64/config index 09dbab15d..115db490d 100644 --- a/debian/arch/amd64/config +++ b/debian/arch/amd64/config @@ -34,7 +34,6 @@ CONFIG_GART_IOMMU=y CONFIG_SWIOTLB=y CONFIG_X86_MCE=y CONFIG_X86_MCE_INTEL=y -CONFIG_SECCOMP=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_ISA_DMA_API=y @@ -425,10 +424,6 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_FWMARK=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_MULTIPATH_CACHED=y -CONFIG_IP_ROUTE_MULTIPATH_RR=m -CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m -CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m -CONFIG_IP_ROUTE_MULTIPATH_DRR=m CONFIG_IP_ROUTE_VERBOSE=y # CONFIG_IP_PNP is not set CONFIG_NET_IPGRE=m diff --git a/debian/arch/amd64/config.default b/debian/arch/amd64/config.default index e15df848e..731ca7955 100644 --- a/debian/arch/amd64/config.default +++ b/debian/arch/amd64/config.default @@ -99,7 +99,6 @@ CONFIG_GART_IOMMU=y CONFIG_SWIOTLB=y CONFIG_X86_MCE=y CONFIG_X86_MCE_INTEL=y -CONFIG_SECCOMP=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_ISA_DMA_API=y diff --git a/debian/arch/config b/debian/arch/config index ac74517d0..cf6a2d38f 100644 --- a/debian/arch/config +++ b/debian/arch/config @@ -172,3 +172,4 @@ CONFIG_CRYPTO_CRC32C=m CONFIG_LIBCRC32C=m CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m +CONFIG_SECCOMP=y diff --git a/debian/arch/i386/config b/debian/arch/i386/config index a1bac4861..27be1dbc1 100644 --- a/debian/arch/i386/config +++ b/debian/arch/i386/config @@ -57,7 +57,6 @@ CONFIG_EDD=m CONFIG_MTRR=y # CONFIG_EFI is not set # CONFIG_REGPARM is not set -# CONFIG_SECCOMP is not set CONFIG_PM=y # CONFIG_PM_DEBUG is not set # CONFIG_SOFTWARE_SUSPEND is not set @@ -521,10 +520,6 @@ CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_ROUTE_FWMARK=y CONFIG_IP_ROUTE_MULTIPATH=y CONFIG_IP_ROUTE_MULTIPATH_CACHED=y -CONFIG_IP_ROUTE_MULTIPATH_RR=m -CONFIG_IP_ROUTE_MULTIPATH_RANDOM=m -CONFIG_IP_ROUTE_MULTIPATH_WRANDOM=m -CONFIG_IP_ROUTE_MULTIPATH_DRR=m CONFIG_IP_ROUTE_VERBOSE=y # CONFIG_IP_PNP is not set CONFIG_NET_IPGRE=m