---

yaml --- r: 40729 b: refs/heads/master c: 38c9437 h: refs/heads/master i: 40727: 5677a2f v: v3
git-mirror · Nov 6, 2006 · ed37453 · ed37453
1 parent 95953df
commit ed37453
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: daccff024ffeb21caa2cc479ccc33b2ec50705b1
+refs/heads/master: 38c94377a36f70e86665231c9f477e445c806618
diff --git a/trunk/net/Kconfig b/trunk/net/Kconfig
@@ -63,6 +63,7 @@ config INET
 if INET
 source "net/ipv4/Kconfig"
 source "net/ipv6/Kconfig"
+source "net/netlabel/Kconfig"
 
 endif # if INET
 
@@ -249,8 +250,6 @@ source "net/ieee80211/Kconfig"
 config WIRELESS_EXT
 	bool
 
-source "net/netlabel/Kconfig"
-
 config FIB_RULES
 	bool
 

diff --git a/trunk/net/netlabel/Kconfig b/trunk/net/netlabel/Kconfig
@@ -4,7 +4,7 @@
 
 config NETLABEL
 	bool "NetLabel subsystem support"
-	depends on NET && SECURITY
+	depends on SECURITY
 	default n
 	---help---
 	  NetLabel provides support for explicit network packet labeling