diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 16:13:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-30 16:13:24 -0500 |
| commit | d661d76b0262f3ed649a1dea24c0119757592b09 (patch) | |
| tree | ff56854943219c16f51e18c5360b9626c3a20474 /Documentation | |
| parent | b07d41b77e58baa2df2326cec68dde03cb2348c5 (diff) | |
| parent | 2d1c861871d767153538a77c498752b36d4bb4b8 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI/cardbus: Add a fixup hook and fix powerpc
PCI: change PCI nomenclature in drivers/pci/ (non-comment changes)
PCI: change PCI nomenclature in drivers/pci/ (comment changes)
PCI: fix section mismatch on update_res()
PCI: add Intel 82599 Virtual Function specific reset method
PCI: add Intel USB specific reset method
PCI: support device-specific reset methods
PCI: Handle case when no pci device can provide cache line size hint
PCI/PM: Propagate wake-up enable for PCIe devices too
vgaarbiter: fix a typo in the vgaarbiter Documentation
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/vgaarbiter.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/vgaarbiter.txt b/Documentation/vgaarbiter.txt index 987f9b0a5ece..43a9b0694fdd 100644 --- a/Documentation/vgaarbiter.txt +++ b/Documentation/vgaarbiter.txt | |||
| @@ -103,7 +103,7 @@ I.2 libpciaccess | |||
| 103 | ---------------- | 103 | ---------------- |
| 104 | 104 | ||
| 105 | To use the vga arbiter char device it was implemented an API inside the | 105 | To use the vga arbiter char device it was implemented an API inside the |
| 106 | libpciaccess library. One fieldd was added to struct pci_device (each device | 106 | libpciaccess library. One field was added to struct pci_device (each device |
| 107 | on the system): | 107 | on the system): |
| 108 | 108 | ||
| 109 | /* the type of resource decoded by the device */ | 109 | /* the type of resource decoded by the device */ |