diff options
author | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-19 00:08:20 -0400 |
commit | bb803cfbecb03a0cf8dc7e1864f18dda6631af00 (patch) | |
tree | 6c0989693bea6f50cfa5c6bb14f52ec19668def3 /Documentation/DocBook | |
parent | 3878fb6fdbceecca20b15748f807340854220f06 (diff) | |
parent | 511e11e396dc596825ce04d53d7f6d579404bc01 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/scsi/fcoe/fcoe.c
Diffstat (limited to 'Documentation/DocBook')
-rw-r--r-- | Documentation/DocBook/Makefile | 5 | ||||
-rw-r--r-- | Documentation/DocBook/kernel-api.tmpl | 6 | ||||
-rw-r--r-- | Documentation/DocBook/kgdb.tmpl | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile index 8918a32c6b3a..b1eb661e6302 100644 --- a/Documentation/DocBook/Makefile +++ b/Documentation/DocBook/Makefile | |||
@@ -143,7 +143,8 @@ quiet_cmd_db2pdf = PDF $@ | |||
143 | $(call cmd,db2pdf) | 143 | $(call cmd,db2pdf) |
144 | 144 | ||
145 | 145 | ||
146 | main_idx = Documentation/DocBook/index.html | 146 | index = index.html |
147 | main_idx = Documentation/DocBook/$(index) | ||
147 | build_main_index = rm -rf $(main_idx) && \ | 148 | build_main_index = rm -rf $(main_idx) && \ |
148 | echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \ | 149 | echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \ |
149 | echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \ | 150 | echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \ |
@@ -232,7 +233,7 @@ clean-files := $(DOCBOOKS) \ | |||
232 | $(patsubst %.xml, %.pdf, $(DOCBOOKS)) \ | 233 | $(patsubst %.xml, %.pdf, $(DOCBOOKS)) \ |
233 | $(patsubst %.xml, %.html, $(DOCBOOKS)) \ | 234 | $(patsubst %.xml, %.html, $(DOCBOOKS)) \ |
234 | $(patsubst %.xml, %.9, $(DOCBOOKS)) \ | 235 | $(patsubst %.xml, %.9, $(DOCBOOKS)) \ |
235 | $(C-procfs-example) | 236 | $(C-procfs-example) $(index) |
236 | 237 | ||
237 | clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man | 238 | clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man |
238 | 239 | ||
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl index d6ac5d61820e..44b3def961a2 100644 --- a/Documentation/DocBook/kernel-api.tmpl +++ b/Documentation/DocBook/kernel-api.tmpl | |||
@@ -190,16 +190,20 @@ X!Ekernel/module.c | |||
190 | !Edrivers/pci/pci.c | 190 | !Edrivers/pci/pci.c |
191 | !Edrivers/pci/pci-driver.c | 191 | !Edrivers/pci/pci-driver.c |
192 | !Edrivers/pci/remove.c | 192 | !Edrivers/pci/remove.c |
193 | !Edrivers/pci/pci-acpi.c | ||
194 | !Edrivers/pci/search.c | 193 | !Edrivers/pci/search.c |
195 | !Edrivers/pci/msi.c | 194 | !Edrivers/pci/msi.c |
196 | !Edrivers/pci/bus.c | 195 | !Edrivers/pci/bus.c |
196 | !Edrivers/pci/access.c | ||
197 | !Edrivers/pci/irq.c | ||
198 | !Edrivers/pci/htirq.c | ||
197 | <!-- FIXME: Removed for now since no structured comments in source | 199 | <!-- FIXME: Removed for now since no structured comments in source |
198 | X!Edrivers/pci/hotplug.c | 200 | X!Edrivers/pci/hotplug.c |
199 | --> | 201 | --> |
200 | !Edrivers/pci/probe.c | 202 | !Edrivers/pci/probe.c |
203 | !Edrivers/pci/slot.c | ||
201 | !Edrivers/pci/rom.c | 204 | !Edrivers/pci/rom.c |
202 | !Edrivers/pci/iov.c | 205 | !Edrivers/pci/iov.c |
206 | !Idrivers/pci/pci-sysfs.c | ||
203 | </sect1> | 207 | </sect1> |
204 | <sect1><title>PCI Hotplug Support Library</title> | 208 | <sect1><title>PCI Hotplug Support Library</title> |
205 | !Edrivers/pci/hotplug/pci_hotplug_core.c | 209 | !Edrivers/pci/hotplug/pci_hotplug_core.c |
diff --git a/Documentation/DocBook/kgdb.tmpl b/Documentation/DocBook/kgdb.tmpl index 372dec20c8da..5cff41a5fa7c 100644 --- a/Documentation/DocBook/kgdb.tmpl +++ b/Documentation/DocBook/kgdb.tmpl | |||
@@ -281,7 +281,7 @@ | |||
281 | seriously wrong while debugging, it will most often be the case | 281 | seriously wrong while debugging, it will most often be the case |
282 | that you want to enable gdb to be verbose about its target | 282 | that you want to enable gdb to be verbose about its target |
283 | communications. You do this prior to issuing the <constant>target | 283 | communications. You do this prior to issuing the <constant>target |
284 | remote</constant> command by typing in: <constant>set remote debug 1</constant> | 284 | remote</constant> command by typing in: <constant>set debug remote 1</constant> |
285 | </para> | 285 | </para> |
286 | </chapter> | 286 | </chapter> |
287 | <chapter id="KGDBTestSuite"> | 287 | <chapter id="KGDBTestSuite"> |