diff options
| author | Randy Dunlap <rdunlap@xenotime.net> | 2005-07-18 22:45:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-07-18 22:45:12 +0200 |
| commit | 54208991e15fa00e37a9d172ac0d87191a832165 (patch) | |
| tree | 9344b79fd780f2a840b3d4f4e6d4dd048ab9cd23 | |
| parent | [SCTP]: Fix potential null pointer dereference while handling an icmp error (diff) | |
| download | linux-54208991e15fa00e37a9d172ac0d87191a832165.tar.xz linux-54208991e15fa00e37a9d172ac0d87191a832165.zip | |
[NET]: Kconfig: NETCONSOLE and NETPOLL together
Put NETCONSOLE and NETPOLL options together since they are related.
This cuts down on the hassle of flipping back and forth between
the Networking menu and the Network drivers menu to change their
config settings.
Tested with menuconfig, gconfig, and xconfig.
gconfig has a small problem with this. I think that it's
a bug in gconfig and I will take it up with Romain Lievin.
Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/Kconfig | 16 | ||||
| -rw-r--r-- | net/Kconfig | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 9a07ff7a7777..f827f0a1e1a6 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2549,4 +2549,20 @@ config NETCONSOLE If you want to log kernel messages over the network, enable this. See <file:Documentation/networking/netconsole.txt> for details. +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 diff --git a/net/Kconfig b/net/Kconfig index 2684e809a649..40a31ba86d2c 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" |