X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=net%2FKconfig;h=6528a935622cc61ca2269a250ada0181932c61ff;hb=b978d0278c3a4c41bda806743c6ef5dca86b4c61;hp=c6cec5aa548604c87aa48ce43fd9c2007052f305;hpb=c0897856553d45aee1780bed455b7c2e888dd64b;p=linux-2.6-omap-h63xx.git

diff --git a/net/Kconfig b/net/Kconfig
index c6cec5aa548..6528a935622 100644
--- 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