From 0f146955675e4bf52bde4bef3e82bdfe36b80f95 Mon Sep 17 00:00:00 2001
From: Maximilian Attems <maks@debian.org>
Date: Wed, 5 May 2010 22:09:34 +0000
Subject: [PATCH] topconfig enable bunch of new netfilter variables and stuff

svn path=/dists/trunk/linux-2.6/; revision=15630
---
 debian/changelog     | 3 +++
 debian/config/config | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6a2124951..1536df96e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ linux-2.6 (2.6.34~rc6-1~experimental.1) UNRELEASED; urgency=low
 
   * 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@debian.org>  Wed, 05 May 2010 22:57:24 +0200
 
 linux-2.6 (2.6.33-1~experimental.5) experimental; urgency=low
diff --git a/debian/config/config b/debian/config/config
index 24b3f56c0..eab5a18f4 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1283,6 +1283,7 @@ CONFIG_SGI_XP=m
 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=m
 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_LOCALVERSION=""
 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_TUNNEL=m
 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_CONNTRACK=m
 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_XTABLES=m
 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_TCP=y
 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