summaryrefslogtreecommitdiffstats
path: root/arch/mips/pci
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2013-06-13 14:34:50 +0200
committerRalf Baechle <ralf@linux-mips.org>2013-06-21 18:07:01 +0200
commit4f675e8a6b338ff6ac510595649c647d4888576e (patch)
tree22dd9160e7636d657a9d9057b1bd147ee1a05d42 /arch/mips/pci
parent73ec78b06ecadb2ce67aae2509e8683ad8b92d14 (diff)
downloadop-kernel-dev-4f675e8a6b338ff6ac510595649c647d4888576e.zip
op-kernel-dev-4f675e8a6b338ff6ac510595649c647d4888576e.tar.gz
MIPS: IP27: Fix build error if CONFIG_PCI=y and CONFIG_NUMA disabled.
Then <asm-generic/topology.h> will define cpp macro as default definition for pcibus_to_node resulting in: CC arch/mips/pci/pci-ip27.o arch/mips/pci/pci-ip27.c:220:7: error: expected identifier or ‘(’ before ‘void’ arch/mips/pci/pci-ip27.c:220:12: error: expected ‘)’ before ‘(’ token make[1]: *** [arch/mips/pci/pci-ip27.o] Error 1 Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/pci')
-rw-r--r--arch/mips/pci/pci-ip27.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c
index 6eb65e4..7b2ac81 100644
--- a/arch/mips/pci/pci-ip27.c
+++ b/arch/mips/pci/pci-ip27.c
@@ -217,6 +217,7 @@ static void pci_fixup_ioc3(struct pci_dev *d)
pci_disable_swapping(d);
}
+#ifdef CONFIG_NUMA
int pcibus_to_node(struct pci_bus *bus)
{
struct bridge_controller *bc = BRIDGE_CONTROLLER(bus);
@@ -224,6 +225,7 @@ int pcibus_to_node(struct pci_bus *bus)
return bc->nasid;
}
EXPORT_SYMBOL(pcibus_to_node);
+#endif /* CONFIG_NUMA */
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SGI, PCI_DEVICE_ID_SGI_IOC3,
pci_fixup_ioc3);
OpenPOWER on IntegriCloud