Merge nommu branch

[powerpc.git] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index c6cec5a..6528a93 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -177,7 +177,7 @@ source "net/lapb/Kconfig"
 
 config NET_DIVERT
        bool "Frame Diverter (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       depends on EXPERIMENTAL && BROKEN
        ---help---
          The Frame Diverter allows you to divert packets from the
          network, that are not aimed at the interface receiving it (in
@@ -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