mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-06 02:50:43 +00:00
mips: pci: Add ifdef around pci_proc_domain
Without these, there are multiple definitions of pci_proc_domain() and pci_domain_nr() if linux/pci.h and asm/pci.h are included. Add #ifdefs around them Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> Reviewed-by: Markos Chandras <Markos.Chandras@imgtec.com> Cc: Markos.Chandras@imgtec.com Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/8670/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
69e4e63ec8
commit
6fb8a163fc
1 changed files with 2 additions and 0 deletions
|
@ -121,6 +121,7 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_PCI_DOMAINS
|
||||||
#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
|
#define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
|
||||||
|
|
||||||
static inline int pci_proc_domain(struct pci_bus *bus)
|
static inline int pci_proc_domain(struct pci_bus *bus)
|
||||||
|
@ -128,6 +129,7 @@ static inline int pci_proc_domain(struct pci_bus *bus)
|
||||||
struct pci_controller *hose = bus->sysdata;
|
struct pci_controller *hose = bus->sysdata;
|
||||||
return hose->need_domain_info;
|
return hose->need_domain_info;
|
||||||
}
|
}
|
||||||
|
#endif /* CONFIG_PCI_DOMAINS */
|
||||||
|
|
||||||
#endif /* __KERNEL__ */
|
#endif /* __KERNEL__ */
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue