diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-24 00:12:35 +0000 |
| commit | 482368b1a8e45430672c58c9a42e7d2004367126 (patch) | |
| tree | ce2a1a567d4d62dee7c2e71a46a99cf72cf1d606 /net/Config.in | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'net/Config.in')
| -rw-r--r-- | net/Config.in | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/Config.in b/net/Config.in index 82f4fe6d9..45f1b1168 100644 --- a/net/Config.in +++ b/net/Config.in @@ -61,11 +61,8 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then fi tristate 'CCITT X.25 Packet Layer (EXPERIMENTAL)' CONFIG_X25 tristate 'LAPB Data Link Driver (EXPERIMENTAL)' CONFIG_LAPB - bool 'Bridging (EXPERIMENTAL)' CONFIG_BRIDGE - if [ "$CONFIG_BRIDGE" != "n" ]; then - int ' Maximum number of bridged interfaces' CONFIG_BRIDGE_NUM_PORTS 8 - fi -bool '802.2 LLC (EXPERIMENTAL)' CONFIG_LLC + tristate '802.1d Ethernet Bridging' CONFIG_BRIDGE + bool '802.2 LLC (EXPERIMENTAL)' CONFIG_LLC # if [ "$CONFIG_LLC" = "y" ]; then # bool ' Netbeui (EXPERIMENTAL)' CONFIG_NETBEUI # fi |