diff options
author | Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> | 2014-12-12 07:45:39 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2015-02-20 07:16:14 -0500 |
commit | 6fb8a163fcb2cc2ee073a1ffda33e402b1092548 (patch) | |
tree | 5b19b5d45b8cccd19bc3ac5fa0331b3726982c4f | |
parent | 69e4e63ec816a7e22cc3aa14bc7ef4ac734d370c (diff) |
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>
-rw-r--r-- | arch/mips/include/asm/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h index 69529624a005..193b4c6b7541 100644 --- a/arch/mips/include/asm/pci.h +++ b/arch/mips/include/asm/pci.h | |||
@@ -121,6 +121,7 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev, | |||
121 | } | 121 | } |
122 | #endif | 122 | #endif |
123 | 123 | ||
124 | #ifdef CONFIG_PCI_DOMAINS | ||
124 | #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index | 125 | #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index |
125 | 126 | ||
126 | static inline int pci_proc_domain(struct pci_bus *bus) | 127 | static inline int pci_proc_domain(struct pci_bus *bus) |
@@ -128,6 +129,7 @@ static inline int pci_proc_domain(struct pci_bus *bus) | |||
128 | struct pci_controller *hose = bus->sysdata; | 129 | struct pci_controller *hose = bus->sysdata; |
129 | return hose->need_domain_info; | 130 | return hose->need_domain_info; |
130 | } | 131 | } |
132 | #endif /* CONFIG_PCI_DOMAINS */ | ||
131 | 133 | ||
132 | #endif /* __KERNEL__ */ | 134 | #endif /* __KERNEL__ */ |
133 | 135 | ||