summaryrefslogtreecommitdiffstats
path: root/drivers/pci/pcie
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2017-09-07 13:24:20 -0500
committerBjorn Helgaas <bhelgaas@google.com>2017-09-07 13:24:20 -0500
commit27e87395ae3497ebb63942150e43999c93a83ed0 (patch)
tree6b8694a556139117401653a5bea2ddff9470bcc9 /drivers/pci/pcie
parent9198407e23ec89f0e1562f439771aeea83345d0d (diff)
parent96291d565550c1fd363e488cc17cb3189d2e4cc2 (diff)
downloadop-kernel-dev-27e87395ae3497ebb63942150e43999c93a83ed0.zip
op-kernel-dev-27e87395ae3497ebb63942150e43999c93a83ed0.tar.gz
Merge branch 'pci/trivial' into next
* pci/trivial: PCI: Fix typos and whitespace errors PCI: Remove unused "res" variable from pci_resource_io() PCI: Correct kernel-doc of pci_vpd_srdt_size(), pci_vpd_srdt_tag()
Diffstat (limited to 'drivers/pci/pcie')
-rw-r--r--drivers/pci/pcie/aer/aerdrv_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
index b1303b3..890efcc 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -5,10 +5,10 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * This file implements the core part of PCI-Express AER. When an pci-express
+ * This file implements the core part of PCIe AER. When a PCIe
* error is delivered, an error message will be collected and printed to
* console, then, an error recovery procedure will be executed by following
- * the pci error recovery rules.
+ * the PCI error recovery rules.
*
* Copyright (C) 2006 Intel Corp.
* Tom Long Nguyen (tom.l.nguyen@intel.com)
OpenPOWER on IntegriCloud