diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-01 17:50:39 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-06-01 17:50:39 -0600 |
| commit | 0345d3f8b2dc761fdebc009093d01c6cec4f11f7 (patch) | |
| tree | 850d0e0b6d363953fd8c23ec43ce2826a53ce32b /drivers/pci/pci.c | |
| parent | b194dbf5eeb4542ff350e30981256c9cb23033fb (diff) | |
| parent | 9a994e8ec7e7d6b1a66c74a683596b0f38f4e345 (diff) | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Replace strict_strtoul() with kstrtoul()
PCI: Fix comment typo for PCI_EXP_LNKCAP_CLKPM
PCI: Replace printks with appropriate pr_*()
PCI: Fix kerneldoc for pci_disable_link_state()
x86/PCI: Increase info->res_num before checking pci_use_crs
PCI: Fix INTC comment typo for pci_swizzle_interrupt_pin()
PCI: Convert ioapic.c to module_pci_driver
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index a899d8bb190..e5f4e55d407 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -2421,7 +2421,7 @@ bool pci_acs_path_enabled(struct pci_dev *start, /** * pci_swizzle_interrupt_pin - swizzle INTx for device behind bridge * @dev: the PCI device - * @pin: the INTx pin (1=INTA, 2=INTB, 3=INTD, 4=INTD) + * @pin: the INTx pin (1=INTA, 2=INTB, 3=INTC, 4=INTD) * * Perform INTx swizzling for a device behind one level of bridge. This is * required by section 9.1 of the PCI-to-PCI bridge specification for devices |