aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-30 13:13:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-30 13:13:24 -0800
commitd661d76b0262f3ed649a1dea24c0119757592b09 (patch)
treeff56854943219c16f51e18c5360b9626c3a20474 /Documentation
parentb07d41b77e58baa2df2326cec68dde03cb2348c5 (diff)
parent2d1c861871d767153538a77c498752b36d4bb4b8 (diff)
downloadvexpress-lsk-d661d76b0262f3ed649a1dea24c0119757592b09.tar.gz
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.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/vgaarbiter.txt b/Documentation/vgaarbiter.txt
index 987f9b0a5ec..43a9b0694fd 100644
--- a/Documentation/vgaarbiter.txt
+++ b/Documentation/vgaarbiter.txt
@@ -103,7 +103,7 @@ I.2 libpciaccess
----------------
To use the vga arbiter char device it was implemented an API inside the
-libpciaccess library. One fieldd was added to struct pci_device (each device
+libpciaccess library. One field was added to struct pci_device (each device
on the system):
/* the type of resource decoded by the device */