diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-24 00:35:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-24 00:35:45 -0400 |
| commit | 2b56fec64faae9fc5c3e61bbfb851b7985292cd5 (patch) | |
| tree | 71b4edb7942d7eafde05e034587530ef18c336e4 /Documentation | |
| parent | 9e1a3e31cbfd5f5822e633c4bdf3304079cb10c2 (diff) | |
| parent | 18166c1a50dc4f5b121ab2bd4fdf178404db9d99 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
PCI: Run k8t_sound_hostbridge quirk only when needed
PCI: disable MSI on RX790
PCI: disable MSI on RD580
PCI: disable MSI on RS690
PCI: make pcie_get_readrq visible in pci.h
PCI: lets kill the 'PCI hidden behind bridge' message
pci/hotplug/cpqphp_ctrl.c: remove stale BKL use
PCI: Document pci_iomap()
PCI: quirk_e100_interrupt() called too early
PCI: Move prototypes for pci_bus_find_capability to include/linux/pci.h
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/DocBook/deviceiobook.tmpl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/DocBook/deviceiobook.tmpl b/Documentation/DocBook/deviceiobook.tmpl index 90ed23df1f68..c917de681ccd 100644 --- a/Documentation/DocBook/deviceiobook.tmpl +++ b/Documentation/DocBook/deviceiobook.tmpl | |||
| @@ -316,7 +316,8 @@ CPU B: spin_unlock_irqrestore(&dev_lock, flags) | |||
| 316 | 316 | ||
| 317 | <chapter id="pubfunctions"> | 317 | <chapter id="pubfunctions"> |
| 318 | <title>Public Functions Provided</title> | 318 | <title>Public Functions Provided</title> |
| 319 | !Einclude/asm-i386/io.h | 319 | !Iinclude/asm-i386/io.h |
| 320 | !Elib/iomap.c | ||
| 320 | </chapter> | 321 | </chapter> |
| 321 | 322 | ||
| 322 | </book> | 323 | </book> |