diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-25 18:46:44 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-25 18:46:44 -0400 |
| commit | 05cb784c81a0fd1f97732156ea464bd392ce875a (patch) | |
| tree | 24122979b411dcec6ff390fc9ae84ad9413128e9 /net/Kconfig | |
| parent | 3190186362466658f01b2e354e639378ce07e1a9 (diff) | |
| parent | 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'net/Kconfig')
| -rw-r--r-- | net/Kconfig | 16 |
1 files changed, 0 insertions, 16 deletions
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" |