diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-07-02 17:19:04 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-07-12 18:11:43 +0200 |
| commit | 6ac5310e649df5fcd240d764503bf16a1317ea39 (patch) | |
| tree | 286700815b3f30dc13cc3b2d9980b0244b244d33 /arch/mips/pci | |
| parent | 704e6460ab75af0735b1ca7c0dcaa4ff0a4001b2 (diff) | |
| parent | 3f90b82df110ef9cb33761b56ca85ae0d0372d4a (diff) | |
| download | op-kernel-dev-6ac5310e649df5fcd240d764503bf16a1317ea39.zip op-kernel-dev-6ac5310e649df5fcd240d764503bf16a1317ea39.tar.gz | |
Merge branch '3.10-fixes' into mips-for-linux-next
This that should have been fixed but weren't, way to much, intrusive
and late.
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 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); |
