On Thu, Oct 01, 2020 at 09:42:43AM +0200, Thomas Petazzoni wrote: > Fixes the following build warning when CONFIG_OF is disabled: > > drivers/pci/controller/dwc/pcie-armada8k.c:344:34: warning: ‘armada8k_pcie_of_match’ defined but not used [-Wunused-const-variable=] > 344 | static const struct of_device_id armada8k_pcie_of_match[] = { > | ^~~~~~~~~~~~~~~~~~~~~~ > > Reported-by: Bjorn Helgaas <helgaas@xxxxxxxxxx> > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@xxxxxxxxxxx> > --- > drivers/pci/controller/dwc/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Merged both patches into pci/dwc, thanks. Lorenzo > diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig > index 044a3761c44f..96994b715f26 100644 > --- a/drivers/pci/controller/dwc/Kconfig > +++ b/drivers/pci/controller/dwc/Kconfig > @@ -176,7 +176,7 @@ config PCIE_QCOM > > config PCIE_ARMADA_8K > bool "Marvell Armada-8K PCIe controller" > - depends on ARCH_MVEBU || COMPILE_TEST > + depends on OF && (ARCH_MVEBU || COMPILE_TEST) > depends on PCI_MSI_IRQ_DOMAIN > select PCIE_DW_HOST > help > -- > 2.26.2 >