diff options
| -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 | |||
| 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 |
diff --git a/net/Kconfig b/net/Kconfig index 2684e809a649..40a31ba86d2c 100644 --- a/net/Kconfig +++ b/net/Kconfig | |||
| @@ -209,22 +209,6 @@ endmenu | |||
| 209 | 209 | ||
| 210 | endmenu | 210 | endmenu |
| 211 | 211 | ||
| 212 | config NETPOLL | ||
| 213 | def_bool NETCONSOLE | ||
| 214 | |||
| 215 | config NETPOLL_RX | ||
| 216 | bool "Netpoll support for trapping incoming packets" | ||
| 217 | default n | ||
| 218 | depends on NETPOLL | ||
| 219 | |||
| 220 | config NETPOLL_TRAP | ||
| 221 | bool "Netpoll traffic trapping" | ||
| 222 | default n | ||
| 223 | depends on NETPOLL | ||
| 224 | |||
| 225 | config NET_POLL_CONTROLLER | ||
| 226 | def_bool NETPOLL | ||
| 227 | |||
| 228 | source "net/ax25/Kconfig" | 212 | source "net/ax25/Kconfig" |
| 229 | source "net/irda/Kconfig" | 213 | source "net/irda/Kconfig" |
| 230 | source "net/bluetooth/Kconfig" | 214 | source "net/bluetooth/Kconfig" |
