diff --git a/[refs] b/[refs] index 382a7525d802..2aa0c2a624dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d01ff0a049f749e0bf10a35bb23edd012718c8c2 +refs/heads/master: 3ced1be5490f5c415d51a1e5918beeb9239d546b diff --git a/trunk/net/netfilter/Kconfig b/trunk/net/netfilter/Kconfig index e8f379692294..d5597b759ba3 100644 --- a/trunk/net/netfilter/Kconfig +++ b/trunk/net/netfilter/Kconfig @@ -201,7 +201,6 @@ config NF_CONNTRACK_BROADCAST config NF_CONNTRACK_NETBIOS_NS tristate "NetBIOS name service protocol support" - depends on NETFILTER_ADVANCED select NF_CONNTRACK_BROADCAST help NetBIOS name service requests are sent as broadcast messages from an