diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-06-14 10:53:59 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-06-14 10:53:59 +0200 |
| commit | 4862618c129f3f68158e38ef0da3c520c91b0f73 (patch) | |
| tree | cb66f125ff38d09159d630970f75814e16011a0f /arch/mips/pci | |
| parent | b332315d8785a2d6c0ab420be2d12643df8ac33c (diff) | |
| parent | a0fb80923d3d95e010a6d110ed814734068d5e00 (diff) | |
Merge branch '3.10-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/pci')
| -rw-r--r-- | arch/mips/pci/pci-ip27.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/pci/pci-ip27.c b/arch/mips/pci/pci-ip27.c index 6eb65e44d9e4..7b2ac81e1f59 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); |