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/dwc | |
| 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/dwc')
| -rw-r--r-- | drivers/pci/dwc/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/pci/dwc/pcie-kirin.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/dwc/Kconfig b/drivers/pci/dwc/Kconfig index 0f666b1ce289..2f3f5c50aa48 100644 --- a/drivers/pci/dwc/Kconfig +++ b/drivers/pci/dwc/Kconfig @@ -176,6 +176,7 @@ config PCIE_ARTPEC6_EP config PCIE_KIRIN depends on OF && ARM64 bool "HiSilicon Kirin series SoCs PCIe controllers" + depends on PCI_MSI_IRQ_DOMAIN depends on PCI select PCIEPORTBUS select PCIE_DW_HOST diff --git a/drivers/pci/dwc/pcie-kirin.c b/drivers/pci/dwc/pcie-kirin.c index 13d839bd6160..a6b88c7f6e3e 100644 --- a/drivers/pci/dwc/pcie-kirin.c +++ b/drivers/pci/dwc/pcie-kirin.c @@ -8,7 +8,6 @@ * Author: Xiaowei Song <songxiaowei@huawei.com> */ -#include <asm/compiler.h> #include <linux/compiler.h> #include <linux/clk.h> #include <linux/delay.h> @@ -505,7 +504,7 @@ static const struct of_device_id kirin_pcie_match[] = { {}, }; -struct platform_driver kirin_pcie_driver = { +static struct platform_driver kirin_pcie_driver = { .probe = kirin_pcie_probe, .driver = { .name = "kirin-pcie", |