summaryrefslogtreecommitdiffstats
path: root/drivers/net/Config.in
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-12-06 23:51:34 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-12-06 23:51:34 +0000
commit230e5ab6a084ed50470f101934782dbf54b0d06b (patch)
tree5dd821c8d33f450470588e7a543f74bf74306e9e /drivers/net/Config.in
parentc9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff)
Merge with Linux 2.1.67.
Diffstat (limited to 'drivers/net/Config.in')
-rw-r--r--drivers/net/Config.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/Config.in b/drivers/net/Config.in
index f0e760d5a..55f010e93 100644
--- a/drivers/net/Config.in
+++ b/drivers/net/Config.in
@@ -141,9 +141,9 @@ if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
fi
fi
-if [ ! "$CONFIG_PARPORT" = "n" ]; then
- dep_tristate 'PLIP (parallel port) support' CONFIG_PLIP $CONFIG_PARPORT
-fi
+#if [ ! "$CONFIG_PARPORT" = "n" ]; then
+# dep_tristate 'PLIP (parallel port) support' CONFIG_PLIP $CONFIG_PARPORT
+#fi
tristate 'PPP (point-to-point) support' CONFIG_PPP
if [ ! "$CONFIG_PPP" = "n" ]; then
@@ -182,7 +182,7 @@ if [ "$CONFIG_NET_RADIO" != "n" ]; then
bool 'HFmodem support for WSS and Crystal cards' CONFIG_HFMODEM_WSS
fi
fi
- tristate 'STRIP (Metricom starmode radio IP)' CONFIG_STRIP
+# tristate 'STRIP (Metricom starmode radio IP)' CONFIG_STRIP
tristate 'AT&T WaveLAN & DEC RoamAbout DS support' CONFIG_WAVELAN
fi