diff options
author | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 22:05:59 +0100 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 22:05:59 +0100 |
commit | 02b25fcff676125a88169c8a78d4c6dd647574ed (patch) | |
tree | 372fc8e885be41ba1819b2767c8889ecd97ff948 /net/Kconfig | |
parent | 1694176a210189312e31b083bac1e1688981219a (diff) | |
parent | a68aa1cc6f3203b8a332683ebde67a00f39eec43 (diff) | |
download | kernel-crypto-02b25fcff676125a88169c8a78d4c6dd647574ed.tar.gz kernel-crypto-02b25fcff676125a88169c8a78d4c6dd647574ed.tar.xz kernel-crypto-02b25fcff676125a88169c8a78d4c6dd647574ed.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/Kconfig')
-rw-r--r-- | net/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/Kconfig b/net/Kconfig index 4959a4e1e0f..6528a935622 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -249,6 +249,11 @@ source "net/ieee80211/Kconfig" config WIRELESS_EXT bool +source "net/netlabel/Kconfig" + +config FIB_RULES + bool + endif # if NET endmenu # Networking |