diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-27 09:14:13 -0400 |
commit | c5fbc3966f48279dbebfde10248c977014aa9988 (patch) | |
tree | 0a52f645d89f91952c26b215f460a4ba195ca42c /drivers/net/Kconfig | |
parent | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (diff) | |
parent | 9e566d8bd61f939b7f5d7d969f5b178571471cf9 (diff) |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/Kconfig')
-rw-r--r-- | drivers/net/Kconfig | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 9a07ff7a7777..534b598866b3 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig | |||
@@ -2544,9 +2544,25 @@ config SHAPER | |||
2544 | 2544 | ||
2545 | config NETCONSOLE | 2545 | config NETCONSOLE |
2546 | tristate "Network console logging support (EXPERIMENTAL)" | 2546 | tristate "Network console logging support (EXPERIMENTAL)" |
2547 | depends on NETDEVICES && EXPERIMENTAL | 2547 | depends on NETDEVICES && INET && EXPERIMENTAL |
2548 | ---help--- | 2548 | ---help--- |
2549 | If you want to log kernel messages over the network, enable this. | 2549 | If you want to log kernel messages over the network, enable this. |
2550 | See <file:Documentation/networking/netconsole.txt> for details. | 2550 | See <file:Documentation/networking/netconsole.txt> for details. |
2551 | 2551 | ||
2552 | config NETPOLL | ||
2553 | def_bool NETCONSOLE | ||
2554 | |||
2555 | config NETPOLL_RX | ||
2556 | bool "Netpoll support for trapping incoming packets" | ||
2557 | default n | ||
2558 | depends on NETPOLL | ||
2559 | |||
2560 | config NETPOLL_TRAP | ||
2561 | bool "Netpoll traffic trapping" | ||
2562 | default n | ||
2563 | depends on NETPOLL | ||
2564 | |||
2565 | config NET_POLL_CONTROLLER | ||
2566 | def_bool NETPOLL | ||
2567 | |||
2552 | endmenu | 2568 | endmenu |