Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[mv-sheeva.git] / Documentation / networking / 00-INDEX

diff --git a/Documentation/networking/00-INDEX b/Documentation/networking/00-INDEX
index 834993d267303d30e53817aafb0ffe4894afb608..b1181ce232d987453f13917904a3f1ba180125f2 100644 (file)
--- a/Documentation/networking/00-INDEX
+++ b/Documentation/networking/00-INDEX
@@ -92,8 +92,6 @@ routing.txt
        - the new routing mechanism
 shaper.txt
        - info on the module that can shape/limit transmitted traffic.
-sis900.txt
-       - SiS 900/7016 Fast Ethernet device driver info.
 sk98lin.txt
        - Marvell Yukon Chipset / SysKonnect SK-98xx compliant Gigabit
          Ethernet Adapter family driver info
@@ -114,9 +112,7 @@ tuntap.txt
 vortex.txt
        - info on using 3Com Vortex (3c590, 3c592, 3c595, 3c597) Ethernet cards.
 wan-router.txt
-       - Wan router documentation
-wanpipe.txt
-       - WANPIPE(tm) Multiprotocol WAN Driver for Linux WAN Router
+       - WAN router documentation
 wavelan.txt
        - AT&T GIS (nee NCR) WaveLAN card: An Ethernet-like radio transceiver
 x25.txt