From 5d888279cc77b5937fcacca296108f93c1aca2ab Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 1 Dec 2011 22:19:01 -0500
Subject: [PATCH] --- yaml --- r: 276271 b: refs/heads/master c:
 3ced1be5490f5c415d51a1e5918beeb9239d546b h: refs/heads/master i:   276269:
 075eee797908b46f0d8f92fc6b479f2cc782d29b   276267:
 7c6dbf145d891b5994b87f040d91f784ecae982e   276263:
 08d5bb3561158dd2c14879aba655559fd2e88d2a   276255:
 06e3f0b0d49003bef02bd2eb5267e6c2060984a5 v: v3

---
 [refs]                      | 2 +-
 trunk/net/netfilter/Kconfig | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

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