Resync some kernel configuration options

SVN-Revision: 11941

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

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

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

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

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

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