From: Winnie Chang <Winnie.Chang@xxxxxxxxxxx> pci_alloc_irq_vectors() needs to be wrapped in CONFIG_PCI and CONFIG_PCI_MSI definition to avoid a function redefinition compiler error. Fixes: 162a6b312f1b ("add support for pci_alloc_irq_vectors") Signed-off-by: Winnie Chang <winnie.chang@xxxxxxxxxxx> Signed-off-by: Chi-Hsien Lin <chi-hsien.lin@xxxxxxxxxxx> --- backport/compat/backport-4.8.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/backport/compat/backport-4.8.c b/backport/compat/backport-4.8.c index e583c1eca01e..a53e39c96dab 100644 --- a/backport/compat/backport-4.8.c +++ b/backport/compat/backport-4.8.c @@ -146,6 +146,8 @@ next_desc: } EXPORT_SYMBOL_GPL(cdc_parse_cdc_header); +#ifdef CONFIG_PCI +#ifdef CONFIG_PCI_MSI int pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, unsigned int max_vecs, unsigned int flags) { @@ -167,3 +169,5 @@ int pci_alloc_irq_vectors(struct pci_dev *dev, unsigned int min_vecs, return -ENOSPC; } EXPORT_SYMBOL_GPL(pci_alloc_irq_vectors); +#endif /* CONFIG_PCI_MSI */ +#endif /* CONFIG_PCI */ -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe backports" in