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/sysctl_net.c | |
| parent | e4d0251c6f56ab2e191afb70f80f382793e23f74 (diff) | |
Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.
Diffstat (limited to 'net/sysctl_net.c')
| -rw-r--r-- | net/sysctl_net.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/sysctl_net.c b/net/sysctl_net.c index 5f5e8593e..e539693fe 100644 --- a/net/sysctl_net.c +++ b/net/sysctl_net.c @@ -34,10 +34,6 @@ extern ctl_table unix_table[]; extern ctl_table ether_table[], e802_table[]; #endif -#ifdef CONFIG_BRIDGE -extern ctl_table bridge_table[]; -#endif - #ifdef CONFIG_IPV6 extern ctl_table ipv6_table[]; #endif @@ -61,9 +57,6 @@ ctl_table net_table[] = { #ifdef CONFIG_IPX {NET_IPX, "ipx", NULL, 0, 0555, ipx_table}, #endif -#ifdef CONFIG_BRIDGE - {NET_BRIDGE, "bridge", NULL, 0, 0555, bridge_table}, -#endif #ifdef CONFIG_IPV6 {NET_IPV6, "ipv6", NULL, 0, 0555, ipv6_table}, #endif |