]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
MIPS: IP27: Fix build error if CONFIG_PCI=y and CONFIG_NUMA disabled.
authorRalf Baechle <ralf@linux-mips.org>
Thu, 13 Jun 2013 12:34:50 +0000 (14:34 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 18 Jun 2013 19:26:55 +0000 (21:26 +0200)
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>
arch/mips/pci/pci-ip27.c

index 6eb65e44d9e4a36ef94e6967c22acb648dc7b3d0..7b2ac81e1f598fb2553edc1cd4c4659cd75882c3 100644 (file)
@@ -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);