linux/3.3: merge recent ubifs patches from 3.2

[oweals/openwrt.git] / target / linux / generic / config-2.6.31

diff --git a/target/linux/generic/config-2.6.31 b/target/linux/generic/config-2.6.31
index 745a33ee479b5e8a291d507f72264dda149f4eee..243503598a01c7b949edf39b5235bbac7de9e6a2 100644 (file)
--- a/target/linux/generic/config-2.6.31
+++ b/target/linux/generic/config-2.6.31
@@ -1469,6 +1469,7 @@ CONFIG_NF_CONNTRACK_PROC_COMPAT=y
 # CONFIG_NF_CONNTRACK_SIP is not set
 CONFIG_NF_CONNTRACK_SUPPORT=y
 # CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CONNTRACK_ZONES is not set
 # CONFIG_NF_CT_ACCT is not set
 # CONFIG_NF_CT_NETLINK is not set
 # CONFIG_NF_CT_PROTO_DCCP is not set