Merge branch 'pci/trivial'

  - Fix typos and comments (Bjorn Helgaas)

  - Fix Kconfig whitespace errors (Krzysztof Kozlowski)

* pci/trivial:
  PCI: Fix indentation
  PCI: Fix typos
  PCI: Remove useless comments and tidy others
  PCI: Remove unnecessary includes

# Conflicts:
#	drivers/pci/probe.c

diff --cc drivers/pci/Kconfig
Simple merge

diff --cc drivers/pci/controller/vmd.c
Simple merge

diff --cc drivers/pci/iov.c
Simple merge

diff --cc drivers/pci/probe.c
index 3cc1c32,4afe327..512cb43
--- 1/drivers/pci/probe.c
--- 2/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -2320,35 -2308,14 +2319,16 @@@ static void pci_init_capabilities(struc
        /* Buffers for saving PCIe and PCI-X capabilities */
        pci_allocate_cap_save_buffers(dev);
  
-       /* Power Management */
-       pci_pm_init(dev);
- 
-       /* Vital Product Data */
-       pci_vpd_init(dev);
- 
-       /* Alternative Routing-ID Forwarding */
-       pci_configure_ari(dev);
- 
-       /* Single Root I/O Virtualization */
-       pci_iov_init(dev);
- 
-       /* Address Translation Services */
-       pci_ats_init(dev);
- 
-       /* Page Request Interface */
-       pci_pri_init(dev);
- 
-       /* Process Address Space ID */
-       pci_pasid_init(dev);
- 
-       /* Enable ACS P2P upstream forwarding */
-       pci_enable_acs(dev);
- 
-       /* Precision Time Measurement */
-       pci_ptm_init(dev);
- 
-       /* Advanced Error Reporting */
-       pci_aer_init(dev);
+       pci_pm_init(dev);               /* Power Management */
+       pci_vpd_init(dev);              /* Vital Product Data */
+       pci_configure_ari(dev);         /* Alternative Routing-ID Forwarding */
+       pci_iov_init(dev);              /* Single Root I/O Virtualization */
+       pci_ats_init(dev);              /* Address Translation Services */
++      pci_pri_init(dev);              /* Page Request Interface */
++      pci_pasid_init(dev);            /* Process Address Space ID */
+       pci_enable_acs(dev);            /* Enable ACS P2P upstream forwarding */
+       pci_ptm_init(dev);              /* Precision Time Measurement */
+       pci_aer_init(dev);              /* Advanced Error Reporting */
  
        pcie_report_downtraining(dev);
  

diff --cc drivers/pci/quirks.c
Simple merge