diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2018-04-04 21:28:48 +0300 |
---|---|---|
committer | Bjorn Helgaas <helgaas@kernel.org> | 2018-04-04 21:28:48 +0300 |
commit | 74716ff7abb483111eb44104b05799226e69b4b3 (patch) | |
tree | a7ab49ff409f9a5e7089d0af6d967ea5a2716f9a /drivers/pci/host/pcie-rcar.c | |
parent | 14d8d776aeda8e367a9354b6cb6a0696671630c9 (diff) | |
parent | 6c994c504fa21843c667edece593dbfa4634b046 (diff) | |
download | linux-74716ff7abb483111eb44104b05799226e69b4b3.tar.xz |
Merge branch '6c994c504fa2'
- exclude af3c73473d10 ("PCI: Improve host drivers compile test
coverage") from lorenzo/pci/host/misc to avoid build failure
* commit '6c994c504fa2':
PCI: v3-semi: Remove unnecessary semicolon
PCI: rcar: Remove unnecessary semicolon
PCI: faraday: Make struct faraday_pci_variant static
PCI: kirin: Make struct kirin_pcie_driver static
PCI: kirin: Fix missing dependency on PCI_MSI_IRQ_DOMAIN
PCI: iproc: Remove dependency on ARM specific struct pci_sys_data
PCI: kirin: Remove unnecessary asm/compiler.h include
PCI: tegra: Add PCI_MSI_IRQ_DOMAIN kconfig dependency
PCI: vmd: Fix malformed Kconfig default
Diffstat (limited to 'drivers/pci/host/pcie-rcar.c')
-rw-r--r-- | drivers/pci/host/pcie-rcar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index b4c4aad2cf66..6ab28f29ac6a 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -435,7 +435,7 @@ static void rcar_pcie_force_speedup(struct rcar_pcie *pcie) } msleep(1); - }; + } dev_err(dev, "Speed change timed out\n"); |