diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-09-23 16:10:31 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-09-23 16:10:31 -0500 |
| commit | c5048a73b4770304699cb15e3ffcb97acab685f7 (patch) | |
| tree | b6e8a8676251a835fcf1f0f927d0182e6ff63be2 /include/linux/pci.h | |
| parent | cdc7e184abb338dfe24624e90b09d366f0dcfad5 (diff) | |
| parent | 55507aea58824578610eb0cb5c250a0c997987c9 (diff) | |
Merge branch 'pci/trivial'
- Fix typos and whitespace errors (Bjorn Helgaas, Krzysztof Wilczynski)
- Remove unnecessary "return" statements (Krzysztof Wilczynski)
- Correct of_irq_parse_pci() function documentation (Lubomir Rintel)
* pci/trivial:
PCI: Remove unnecessary returns
PCI: OF: Correct of_irq_parse_pci() documentation
PCI: Fix typos and whitespace errors
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index c1c2e4c7242a..deecf3cc17b1 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -971,7 +971,7 @@ resource_size_t pcibios_align_resource(void *, const struct resource *, resource_size_t, resource_size_t); -/* Weak but can be overriden by arch */ +/* Weak but can be overridden by arch */ void pci_fixup_cardbus(struct pci_bus *); /* Generic PCI functions used internally */ @@ -1791,7 +1791,7 @@ static inline int pci_ats_page_aligned(struct pci_dev *dev) { return 0; } #include <asm/pci.h> -/* These two functions provide almost identical functionality. Depennding +/* These two functions provide almost identical functionality. Depending * on the architecture, one will be implemented as a wrapper around the * other (in drivers/pci/mmap.c). * |