r3556 - in trunk/kernel/source/linux-2.6-2.6.12/debian/arch: . amd64 i386

[Andres Salomon]

Author: dilinger
Date: 2005-07-16 12:50:59 +0000 (Sat, 16 Jul 2005)
New Revision: 3556

Modified:
   trunk/kernel/source/linux-2.6-2.6.12/debian/arch/amd64/config
   trunk/kernel/source/linux-2.6-2.6.12/debian/arch/amd64/config.default
   trunk/kernel/source/linux-2.6-2.6.12/debian/arch/config
   trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/config
Log:
enable CONFIG_SECCOMP for everyone; remove old NETFILTER option for everyone
that're no longer used


Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/amd64/config
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/amd64/config	2005-07-16 12:49:55 UTC (rev 3555)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/amd64/config	2005-07-16 12:50:59 UTC (rev 3556)
@@ -34,7 +34,6 @@
 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_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

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/amd64/config.default
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/amd64/config.default	2005-07-16 12:49:55 UTC (rev 3555)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/amd64/config.default	2005-07-16 12:50:59 UTC (rev 3556)
@@ -99,7 +99,6 @@
 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

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/config
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/config	2005-07-16 12:49:55 UTC (rev 3555)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/config	2005-07-16 12:50:59 UTC (rev 3556)
@@ -172,3 +172,4 @@
 CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=m
+CONFIG_SECCOMP=y

Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/config
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/config	2005-07-16 12:49:55 UTC (rev 3555)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/config	2005-07-16 12:50:59 UTC (rev 3556)
@@ -57,7 +57,6 @@
 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_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