summaryrefslogtreecommitdiffstats
path: root/Documentation/PCI/PCIEBUS-HOWTO.txt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-05 12:47:28 +0100
committerIngo Molnar <mingo@elte.hu>2009-03-05 12:47:28 +0100
commit7df4edb07cf54a4868b9a750424c0d2aa68f8d66 (patch)
tree0ad0ad3f3dcb6f9edf26dde42ba625053dddf54f /Documentation/PCI/PCIEBUS-HOWTO.txt
parentIA64: fix swiotlb alloc_coherent for non DMA_64BIT_MASK devices, fix (diff)
parentMerge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/po... (diff)
downloadlinux-7df4edb07cf54a4868b9a750424c0d2aa68f8d66.tar.xz
linux-7df4edb07cf54a4868b9a750424c0d2aa68f8d66.zip
Merge branch 'linus' into core/iommu
Diffstat (limited to 'Documentation/PCI/PCIEBUS-HOWTO.txt')
-rw-r--r--Documentation/PCI/PCIEBUS-HOWTO.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/PCI/PCIEBUS-HOWTO.txt b/Documentation/PCI/PCIEBUS-HOWTO.txt
index 9a07e38631b0..6bd5f372adec 100644
--- a/Documentation/PCI/PCIEBUS-HOWTO.txt
+++ b/Documentation/PCI/PCIEBUS-HOWTO.txt
@@ -93,7 +93,7 @@ the PCI Express Port Bus driver from loading a service driver.
int pcie_port_service_register(struct pcie_port_service_driver *new)
-This API replaces the Linux Driver Model's pci_module_init API. A
+This API replaces the Linux Driver Model's pci_register_driver API. A
service driver should always calls pcie_port_service_register at
module init. Note that after service driver being loaded, calls
such as pci_enable_device(dev) and pci_set_master(dev) are no longer