diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 18:43:31 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2021-05-04 18:43:31 +0300 |
| commit | a4ffbb7a96eab872ead38f8013883e958180c730 (patch) | |
| tree | 3825c7ce5e82e4b5eeefad0af85a35ac2342fa63 /drivers/pci | |
| parent | 51bc2b7ffd5d9c39c04a76fbb30c1f53c0cc635e (diff) | |
| parent | 52ab55dfe32357d5889eef2969a03dd662aa2b7d (diff) | |
| download | linux-a4ffbb7a96eab872ead38f8013883e958180c730.tar.xz | |
Merge branch 'remotes/lorenzo/pci/misc'
- Remove layerscape-gen4 dependencies on OF and ARM64, add dependency on
ARCH_LAYERSCAPE (Geert Uytterhoeven)
- Remove obsolete HiSilicon PCIe DT description (Dongdong Liu)
* remotes/lorenzo/pci/misc:
dt-bindings: PCI: hisi: Delete the obsolete HiSilicon PCIe file
PCI: mobiveil: Improve PCIE_LAYERSCAPE_GEN4 dependencies
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/controller/mobiveil/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/controller/mobiveil/Kconfig b/drivers/pci/controller/mobiveil/Kconfig index a62d247018cf..e4643fb94e78 100644 --- a/drivers/pci/controller/mobiveil/Kconfig +++ b/drivers/pci/controller/mobiveil/Kconfig @@ -24,8 +24,7 @@ config PCIE_MOBIVEIL_PLAT config PCIE_LAYERSCAPE_GEN4 bool "Freescale Layerscape PCIe Gen4 controller" - depends on PCI - depends on OF && (ARM64 || ARCH_LAYERSCAPE) + depends on ARCH_LAYERSCAPE || COMPILE_TEST depends on PCI_MSI_IRQ_DOMAIN select PCIE_MOBIVEIL_HOST help |