From 33ae24f5b5e976adbba56064e3ad60dd31422b9d Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Sat, 26 Jul 2008 18:23:38 +0000 Subject: [PATCH] Resync some kernel configuration options SVN-Revision: 11941 --- target/linux/generic-2.6/config-2.6.23 | 1 + target/linux/generic-2.6/config-2.6.24 | 1 + target/linux/generic-2.6/config-2.6.25 | 1 + target/linux/generic-2.6/config-2.6.26 | 1 + target/linux/uml/config/i386 | 1 - target/linux/uml/config/x86_64 | 1 - 6 files changed, 4 insertions(+), 2 deletions(-) diff --git a/target/linux/generic-2.6/config-2.6.23 b/target/linux/generic-2.6/config-2.6.23 index b2860f9ce14..863a9aeb6e3 100644 --- a/target/linux/generic-2.6/config-2.6.23 +++ b/target/linux/generic-2.6/config-2.6.23 @@ -525,6 +525,7 @@ CONFIG_IP6_NF_TARGET_ROUTE=m CONFIG_IPSEC_NAT_TRAVERSAL=y CONFIG_IPV6=m # CONFIG_IPV6_MIP6 is not set +# CONFIG_IPV6_MROUTE is not set # CONFIG_IPV6_MULTIPLE_TABLES is not set # CONFIG_IPV6_OPTIMISTIC_DAD is not set # CONFIG_IPV6_PRIVACY is not set diff --git a/target/linux/generic-2.6/config-2.6.24 b/target/linux/generic-2.6/config-2.6.24 index 579df9fbd48..466d5ded95f 100644 --- a/target/linux/generic-2.6/config-2.6.24 +++ b/target/linux/generic-2.6/config-2.6.24 @@ -541,6 +541,7 @@ CONFIG_IP6_NF_TARGET_ROUTE=m CONFIG_IPSEC_NAT_TRAVERSAL=y CONFIG_IPV6=m # CONFIG_IPV6_MIP6 is not set +# CONFIG_IPV6_MROUTE is not set # CONFIG_IPV6_MULTIPLE_TABLES is not set # CONFIG_IPV6_OPTIMISTIC_DAD is not set # CONFIG_IPV6_PRIVACY is not set diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25 index 7c3bc53e8ff..203b43b4cd4 100644 --- a/target/linux/generic-2.6/config-2.6.25 +++ b/target/linux/generic-2.6/config-2.6.25 @@ -553,6 +553,7 @@ CONFIG_IP6_NF_TARGET_ROUTE=m CONFIG_IPSEC_NAT_TRAVERSAL=y CONFIG_IPV6=m # CONFIG_IPV6_MIP6 is not set +# CONFIG_IPV6_MROUTE is not set # CONFIG_IPV6_MULTIPLE_TABLES is not set # CONFIG_IPV6_OPTIMISTIC_DAD is not set # CONFIG_IPV6_PRIVACY is not set diff --git a/target/linux/generic-2.6/config-2.6.26 b/target/linux/generic-2.6/config-2.6.26 index 1e6951d72fb..8cc2dd8cc68 100644 --- a/target/linux/generic-2.6/config-2.6.26 +++ b/target/linux/generic-2.6/config-2.6.26 @@ -564,6 +564,7 @@ CONFIG_IP6_NF_TARGET_ROUTE=m CONFIG_IPSEC_NAT_TRAVERSAL=y CONFIG_IPV6=m # CONFIG_IPV6_MIP6 is not set +# CONFIG_IPV6_MROUTE is not set # CONFIG_IPV6_MULTIPLE_TABLES is not set # CONFIG_IPV6_OPTIMISTIC_DAD is not set # CONFIG_IPV6_PRIVACY is not set diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386 index 80846466166..72bf3f29733 100644 --- a/target/linux/uml/config/i386 +++ b/target/linux/uml/config/i386 @@ -166,5 +166,4 @@ CONFIG_X86_USE_PPRO_CHECKSUM=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_XADD=y CONFIG_XTERM_CHAN=y -CONFIG_ZLIB_DEFLATE=m CONFIG_ZONE_DMA_FLAG=0 diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64 index a992e5f26d5..d983e2766ac 100644 --- a/target/linux/uml/config/x86_64 +++ b/target/linux/uml/config/x86_64 @@ -111,5 +111,4 @@ CONFIG_UML_X86=y # CONFIG_UNUSED_SYMBOLS is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_XTERM_CHAN=y -CONFIG_ZLIB_DEFLATE=m CONFIG_ZONE_DMA_FLAG=0 -- 2.30.2