summaryrefslogtreecommitdiffstats
path: root/Documentation/networking
diff options
context:
space:
mode:
author <jgarzik@pretzel.yyz.us>2005-06-04 17:12:32 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-06-04 17:12:32 -0400
commitbdb7a3427be1e31327df0543cc397bf3c994b039 (patch)
treea5cc2585912388a454e23177181c6dd365983681 /Documentation/networking
parent140fedb5f2efd1f23b26afb2d812004556ba9515 (diff)
parent5aa83a4c0a1568257ff7e249d39af64f75978b97 (diff)
downloadtalos-op-linux-bdb7a3427be1e31327df0543cc397bf3c994b039.tar.gz
talos-op-linux-bdb7a3427be1e31327df0543cc397bf3c994b039.zip
Automatic merge of /spare/repo/netdev-2.6 branch remove-drivers
Diffstat (limited to 'Documentation/networking')
-rw-r--r--Documentation/networking/multicast.txt1
-rw-r--r--Documentation/networking/net-modules.txt3
2 files changed, 0 insertions, 4 deletions
diff --git a/Documentation/networking/multicast.txt b/Documentation/networking/multicast.txt
index 5049a64313d1..b06c8c69266f 100644
--- a/Documentation/networking/multicast.txt
+++ b/Documentation/networking/multicast.txt
@@ -47,7 +47,6 @@ ni52 <------------------ Buggy ------------------>
ni65 YES YES YES Software(#)
seeq NO NO NO N/A
sgiseek <------------------ Buggy ------------------>
-sk_g16 NO NO YES N/A
smc-ultra YES YES YES Hardware
sunlance YES YES YES Hardware
tulip YES YES YES Hardware
diff --git a/Documentation/networking/net-modules.txt b/Documentation/networking/net-modules.txt
index 3830a83513d2..0b27863f155c 100644
--- a/Documentation/networking/net-modules.txt
+++ b/Documentation/networking/net-modules.txt
@@ -284,9 +284,6 @@ ppp.c:
seeq8005.c: *Not modularized*
(Probes ports: 0x300, 0x320, 0x340, 0x360)
-sk_g16.c: *Not modularized*
- (Probes ports: 0x100, 0x180, 0x208, 0x220m 0x288, 0x320, 0x328, 0x390)
-
skeleton.c: *Skeleton*
slhc.c:
OpenPOWER on IntegriCloud