From d3e71cb08747743fce908122bab08b479eb403a5 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 27 Mar 2000 23:54:12 +0000
Subject: Merge with Linux 2.3.99-pre3.

---
 Documentation/DocBook/Makefile        |  5 ++++-
 Documentation/DocBook/kernel-api.tmpl | 13 ++++++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'Documentation/DocBook')

diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 155133a0a..368f037f7 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -26,8 +26,11 @@ kernel-api.sgml: kernel-api.tmpl
 		$(TOPDIR)/arch/i386/kernel/mca.c \
 		$(TOPDIR)/arch/i386/kernel/mtrr.c \
 		$(TOPDIR)/drivers/char/misc.c \
-		$(TOPDIR)/drivers/char/serial.c \
 		$(TOPDIR)/drivers/char/videodev.c \
+		$(TOPDIR)/drivers/net/net_init.c \
+		$(TOPDIR)/drivers/net/8390.c \
+		$(TOPDIR)/drivers/char/serial.c \
+		$(TOPDIR)/drivers/pci/pci.c \
 		$(TOPDIR)/drivers/sound/sound_core.c \
 		$(TOPDIR)/drivers/sound/sound_firmware.c \
 		$(TOPDIR)/drivers/net/wan/syncppp.c \
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index 96dd9ecc0..f0013b011 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -49,7 +49,7 @@
   </chapter>
 
   <chapter id="miscdev">
-     <title>Miscellaneous Device</title>
+     <title>Miscellaneous Devices</title>
 !Edrivers/char/misc.c
   </chapter>
 
@@ -58,6 +58,12 @@
 !Edrivers/char/videodev.c
   </chapter>
 
+  <chapter id="netdev">
+     <title>Network devices</title>
+!Idrivers/net/net_init.c
+!Edrivers/net/8390.c
+  </chapter>
+
   <chapter id="snddev">
      <title>Sound Devices</title>
 !Edrivers/sound/sound_core.c
@@ -89,4 +95,9 @@
 !Edrivers/net/wan/z85230.c
   </chapter>
 
+  <chapter id="pcilib">
+     <title>PCI Support Library</title>
+!Edrivers/pci/pci.c
+  </chapter>
+
 </book>
-- 
cgit v1.2.3