[kernel] r15630 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Wed May  5 22:09:34 2010
New Revision: 15630

Log:
topconfig enable bunch of new netfilter variables and stuff

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Wed May  5 21:51:33 2010	(r15629)
+++ dists/trunk/linux-2.6/debian/changelog	Wed May  5 22:09:34 2010	(r15630)
@@ -2,6 +2,9 @@
 
   * New upstream release
 
+  * topconfig enable IPV6_SIT_6RD, NETFILTER_XT_TARGET_CT, IP_VS_PROTO_SCTP,
+    NF_CONNTRACK_ZONES, CAN_PLX_PCI, TI_DAC7512.
+
  -- maximilian attems <maks at debian.org>  Wed, 05 May 2010 22:57:24 +0200
 
 linux-2.6 (2.6.33-1~experimental.5) experimental; urgency=low

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Wed May  5 21:51:33 2010	(r15629)
+++ dists/trunk/linux-2.6/debian/config/config	Wed May  5 22:09:34 2010	(r15630)
@@ -1283,6 +1283,7 @@
 CONFIG_SGI_GRU=m
 # CONFIG_SGI_GRU_DEBUG is not set
 CONFIG_ISL29003=m
+CONFIG_TI_DAC7512=m
 
 ##
 ## file: drivers/misc/c2port/Kconfig
@@ -1529,6 +1530,7 @@
 CONFIG_CAN_SJA1000_PLATFORM=m
 CONFIG_CAN_EMS_PCI=m
 CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PLX_PCI=m
 
 ##
 ## file: drivers/net/can/usb/Kconfig
@@ -3177,6 +3179,7 @@
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_BZIP2 is not set
 # CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_LZO is not set
 ## end choice
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
@@ -3636,6 +3639,7 @@
 CONFIG_INET6_XFRM_MODE_BEET=m
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_SIT=m
+CONIFG_IPV6_SIT_6RD=y
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_SUBTREES=y
@@ -3694,6 +3698,7 @@
 CONFIG_NF_CT_ACCT=y
 CONFIG_NF_CONNTRACK_MARK=y
 CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
 CONFIG_NF_CONNTRACK_EVENTS=y
 CONFIG_NF_CT_PROTO_DCCP=m
 CONFIG_NF_CT_PROTO_SCTP=m
@@ -3713,6 +3718,7 @@
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_LED=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
@@ -3772,6 +3778,7 @@
 CONFIG_IP_VS_PROTO_UDP=y
 CONFIG_IP_VS_PROTO_ESP=y
 CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
 CONFIG_IP_VS_RR=m
 CONFIG_IP_VS_WRR=m
 CONFIG_IP_VS_LC=m