X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=net%2FKconfig;h=2bdd5623fdd50889327bd4889e137f82bea6279c;hb=5acd57936c3224fd86e838201e528e0169373e9b;hp=3ae4a47e60aeaab448bdca858174aba1f50ec792;hpb=08cd84c81f27d5bd22ba958b7cae6d566c509280;p=linux-2.6

diff --git a/net/Kconfig b/net/Kconfig
index 3ae4a47e60..2bdd5623fd 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -147,6 +147,7 @@ source "net/bridge/netfilter/Kconfig"
 
 endif
 
+source "net/dccp/Kconfig"
 source "net/sctp/Kconfig"
 source "net/atm/Kconfig"
 source "net/bridge/Kconfig"
@@ -205,25 +206,11 @@ config NET_PKTGEN
 	  To compile this code as a module, choose M here: the
 	  module will be called pktgen.
 
-endmenu
+source "net/netfilter/Kconfig"
 
 endmenu
 
-config NETPOLL
-	def_bool NETCONSOLE
-
-config NETPOLL_RX
-	bool "Netpoll support for trapping incoming packets"
-	default n
-	depends on NETPOLL
-
-config NETPOLL_TRAP
-	bool "Netpoll traffic trapping"
-	default n
-	depends on NETPOLL
-
-config NET_POLL_CONTROLLER
-	def_bool NETPOLL
+endmenu
 
 source "net/ax25/Kconfig"
 source "net/irda/Kconfig"