/spare/repo/netdev-2.6 branch 'master'

[linux-2.6] / net / Kconfig

diff --git a/net/Kconfig b/net/Kconfig
index 3ae4a47e60aeaab448bdca858174aba1f50ec792..32327d0a56ad0c9c9a52094cc05d072d5524fd18 100644 (file)
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -209,22 +209,6 @@ endmenu
 
 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
-
 source "net/ax25/Kconfig"
 source "net/irda/Kconfig"
 source "net/bluetooth/Kconfig"