aboutsummaryrefslogtreecommitdiffstats
path: root/net/Kconfig
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-07-30 18:14:15 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-07-30 18:14:15 -0400
commita670fcb43f01a67ef56176afc76e5d43d128b25c (patch)
tree09c9411c78a33ff980e9ea871bc7686e7589abbf /net/Kconfig
parentMerge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6. (diff)
parent[PATCH] agp: restore APBASE after setting APSIZE (diff)
downloadlinux-dev-a670fcb43f01a67ef56176afc76e5d43d128b25c.tar.xz
linux-dev-a670fcb43f01a67ef56176afc76e5d43d128b25c.zip
/spare/repo/netdev-2.6 branch 'master'
Diffstat (limited to 'net/Kconfig')
-rw-r--r--net/Kconfig16
1 files changed, 0 insertions, 16 deletions
diff --git a/net/Kconfig b/net/Kconfig
index 3ae4a47e60ae..32327d0a56ad 100644
--- 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"