diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-07 17:34:33 -0700 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-01-07 17:34:33 -0700 |
commit | ccb126545448136d36da8661f2941372554015d1 (patch) | |
tree | 76d44f07f2b1b9f79f6ff7045c113edeefeafa3b /Documentation/PCI | |
parent | 1ecf38c8ae5fab7397f7af65a5064a040940a0a1 (diff) | |
parent | c2a5a829e28c476880b5efc8755ab3b339fdc147 (diff) | |
download | blackbird-op-linux-ccb126545448136d36da8661f2941372554015d1.tar.gz blackbird-op-linux-ccb126545448136d36da8661f2941372554015d1.zip |
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 @@ - this file MSI-HOWTO.txt - the Message Signaled Interrupts (MSI) Driver Guide HOWTO and FAQ. -PCI-DMA-mapping.txt - - info for PCI drivers using DMA portably across all platforms PCIEBUS-HOWTO.txt - a guide describing the PCI Express Port Bus driver pci-error-recovery.txt - info on PCI error recovery +pci-iov-howto.txt + - the PCI Express I/O Virtualization HOWTO pci.txt - info on the PCI subsystem for device driver authors pcieaer-howto.txt |