From ed374538e897370d71fc92764b030bbcaad0bfed Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Sun, 5 Nov 2006 16:44:06 -0800 Subject: [PATCH] --- yaml --- r: 40729 b: refs/heads/master c: 38c94377a36f70e86665231c9f477e445c806618 h: refs/heads/master i: 40727: 5677a2f744c32030930fc2d47f4e6c9477043b54 v: v3 --- [refs] | 2 +- trunk/net/Kconfig | 3 +-- trunk/net/netlabel/Kconfig | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 31e118b4509d..79a147e59327 100644 --- 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 index a81aca43932f..67e39ad8b8b6 100644 --- 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 index 9f7121ae13e9..56958c85f2b4 100644 --- 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