linux-atm: update solos-pci driver to upstream

[openwrt/svn-archive/archive.git] / target / linux / generic / config-2.6.37

diff --git a/target/linux/generic/config-2.6.37 b/target/linux/generic/config-2.6.37
index c86bc9fcf4a489d37df8282f7e8dcecc3c36f8c4..9baebc3ae2d4cc24b24616fad74bdf3779ffcb4a 100644 (file)
--- a/target/linux/generic/config-2.6.37
+++ b/target/linux/generic/config-2.6.37
@@ -286,7 +286,7 @@ CONFIG_BRIDGE=y
 # CONFIG_BRIDGE_EBT_T_NAT is not set
 # CONFIG_BRIDGE_EBT_ULOG is not set
 # CONFIG_BRIDGE_EBT_VLAN is not set
-CONFIG_BRIDGE_IGMP_SNOOPING=y
+# CONFIG_BRIDGE_IGMP_SNOOPING is not set
 # CONFIG_BRIDGE_NETFILTER is not set
 # CONFIG_BRIDGE_NF_EBTABLES is not set
 # CONFIG_BROADCOM_PHY is not set
@@ -1623,6 +1623,7 @@ CONFIG_NFS_V3=y
 # CONFIG_NF_CONNTRACK_SANE is not set
 # CONFIG_NF_CONNTRACK_SIP is not set
 # CONFIG_NF_CONNTRACK_TFTP is not set
+# CONFIG_NF_CONNTRACK_ZONES is not set
 # CONFIG_NF_CT_NETLINK is not set
 # CONFIG_NF_CT_PROTO_DCCP is not set
 # CONFIG_NF_CT_PROTO_GRE is not set