aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-04 10:39:28 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-04 10:39:28 -0800
commit912cbe3c5be5afb28184bb2e49a48fa4a1b098db (patch)
tree07b324a87f7d67be6df5d3e82f986fecbb3c6c0b /Documentation
parentMerge git://oss.sgi.com:8090/oss/git/xfs-2.6 (diff)
parent[PKT_SCHED]: Rework QoS and/or fair queueing configuration (diff)
downloadlinux-dev-912cbe3c5be5afb28184bb2e49a48fa4a1b098db.tar.xz
linux-dev-912cbe3c5be5afb28184bb2e49a48fa4a1b098db.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/DocBook/kernel-api.tmpl6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index 4d9b66d8b4db..ec474e5a25ed 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -239,9 +239,9 @@ X!Ilib/string.c
<title>Network device support</title>
<sect1><title>Driver Support</title>
!Enet/core/dev.c
- </sect1>
- <sect1><title>8390 Based Network Cards</title>
-!Edrivers/net/8390.c
+!Enet/ethernet/eth.c
+!Einclude/linux/etherdevice.h
+!Enet/core/wireless.c
</sect1>
<sect1><title>Synchronous PPP</title>
!Edrivers/net/wan/syncppp.c