summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-07-26 18:23:38 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-07-26 18:23:38 +0000
commitc877471a0d129cb9b5e2d63e8894f22d64c0b248 (patch)
tree91f48ceae5cd34acac8a70b12f9bf5d8b24a9f71
parent24a20793671a7cde80b57c7e6c6069f7d46febde (diff)
Resync some kernel configuration options
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11941 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic-2.6/config-2.6.231
-rw-r--r--target/linux/generic-2.6/config-2.6.241
-rw-r--r--target/linux/generic-2.6/config-2.6.251
-rw-r--r--target/linux/generic-2.6/config-2.6.261
-rw-r--r--target/linux/uml/config/i3861
-rw-r--r--target/linux/uml/config/x86_641
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 b2860f9ce..863a9aeb6 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 579df9fbd..466d5ded9 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 7c3bc53e8..203b43b4c 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 1e6951d72..8cc2dd8cc 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 808464661..72bf3f297 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 a992e5f26..d983e2766 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