diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-01 04:02:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-01 04:02:08 +0000 |
| commit | fd095d09f2d475dc2e8599b1b8bae1cd65e91685 (patch) | |
| tree | 217f87a997699505e0dd752931409b9f10fffe65 /net/Config.in | |
| parent | c02e0599c4233f97071928f8118841954bacdadf (diff) | |
Merge with 2.1.56 as first part of merging back my code.
Diffstat (limited to 'net/Config.in')
| -rw-r--r-- | net/Config.in | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/Config.in b/net/Config.in index d9ec19354..f5a06935a 100644 --- a/net/Config.in +++ b/net/Config.in @@ -31,9 +31,6 @@ if [ "$CONFIG_IPX" != "n" ]; then fi fi tristate 'Appletalk DDP' CONFIG_ATALK -if [ "$CONFIG_ATALK" != "n" ]; then - bool 'IP-over-DDP support (EXPERIMENTAL)' CONFIG_IPDDP -fi tristate 'Amateur Radio AX.25 Level 2' CONFIG_AX25 if [ "$CONFIG_AX25" != "n" ]; then bool 'AX.25 DAMA Slave support' CONFIG_AX25_DAMA_SLAVE @@ -53,6 +50,6 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then # if [ "$CONFIG_LLC" = "y" ]; then # bool 'Netbeui (EXPERIMENTAL)' CONFIG_NETBEUI # fi - bool 'WAN router' CONFIG_WAN_ROUTER + tristate 'WAN router' CONFIG_WAN_ROUTER fi endmenu |