summaryrefslogtreecommitdiffstats
path: root/net/Config.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-06-13 16:29:25 +0000
commitdb7d4daea91e105e3859cf461d7e53b9b77454b2 (patch)
tree9bb65b95440af09e8aca63abe56970dd3360cc57 /net/Config.in
parent9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff)
Merge with Linux 2.2.8.
Diffstat (limited to 'net/Config.in')
-rw-r--r--net/Config.in1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/Config.in b/net/Config.in
index ae9abe2e5..ed8510209 100644
--- a/net/Config.in
+++ b/net/Config.in
@@ -10,7 +10,6 @@ if [ "$CONFIG_NETLINK" = "y" ]; then
tristate 'Netlink device emulation' CONFIG_NETLINK_DEV
fi
bool 'Network firewalls' CONFIG_FIREWALL
-bool 'Network aliasing' CONFIG_NET_ALIAS
bool 'Socket Filtering' CONFIG_FILTER
tristate 'Unix domain sockets' CONFIG_UNIX
bool 'TCP/IP networking' CONFIG_INET