diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-07 19:34:33 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-07 19:34:33 -0500 |
| commit | ccb126545448136d36da8661f2941372554015d1 (patch) | |
| tree | 76d44f07f2b1b9f79f6ff7045c113edeefeafa3b /Documentation/PCI | |
| parent | 1ecf38c8ae5fab7397f7af65a5064a040940a0a1 (diff) | |
| parent | c2a5a829e28c476880b5efc8755ab3b339fdc147 (diff) | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Update documentation 00-INDEX file
PCI: Convert ioapic to be builtin only, not modular
Diffstat (limited to 'Documentation/PCI')
| -rw-r--r-- | Documentation/PCI/00-INDEX | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/PCI/00-INDEX b/Documentation/PCI/00-INDEX index 812b17fe3ed0..147231f1613e 100644 --- a/Documentation/PCI/00-INDEX +++ b/Documentation/PCI/00-INDEX | |||
| @@ -2,12 +2,12 @@ | |||
| 2 | - this file | 2 | - this file |
| 3 | MSI-HOWTO.txt | 3 | MSI-HOWTO.txt |
| 4 | - the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ. | 4 | - the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ. |
| 5 | PCI-DMA-mapping.txt | ||
| 6 | - info for PCI drivers using DMA portably across all platforms | ||
| 7 | PCIEBUS-HOWTO.txt | 5 | PCIEBUS-HOWTO.txt |
| 8 | - a guide describing the PCI Express Port Bus driver | 6 | - a guide describing the PCI Express Port Bus driver |
| 9 | pci-error-recovery.txt | 7 | pci-error-recovery.txt |
| 10 | - info on PCI error recovery | 8 | - info on PCI error recovery |
| 9 | pci-iov-howto.txt | ||
| 10 | - the PCI Express I/O Virtualization HOWTO | ||
| 11 | pci.txt | 11 | pci.txt |
| 12 | - info on the PCI subsystem for device driver authors | 12 | - info on the PCI subsystem for device driver authors |
| 13 | pcieaer-howto.txt | 13 | pcieaer-howto.txt |