From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 27 Nov 2006 18:19:00 +0000 (+0100)
Subject: [POWERPC] fix building without PCI
X-Git-Tag: v2.6.20-rc2~6^2~13^2~13^2~35
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=11faa658c668030759d4aea6a273b7ac9a0b4746;p=linux-2.6-omap-h63xx.git

[POWERPC] fix building without PCI

At least the ide driver calls pcibus_to_node, which is not
defined when CONFIG_PCI is disabled. This adds a nop function
for the !PCI case.

Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
---

diff --git a/include/asm-powerpc/topology.h b/include/asm-powerpc/topology.h
index 9fe7894ee03..50c014007de 100644
--- a/include/asm-powerpc/topology.h
+++ b/include/asm-powerpc/topology.h
@@ -32,7 +32,14 @@ static inline int node_to_first_cpu(int node)
 int of_node_to_nid(struct device_node *device);
 
 struct pci_bus;
+#ifdef CONFIG_PCI
 extern int pcibus_to_node(struct pci_bus *bus);
+#else
+static inline int pcibus_to_node(struct pci_bus *bus)
+{
+	return -1;
+}
+#endif
 
 #define pcibus_to_cpumask(bus)	(pcibus_to_node(bus) == -1 ? \
 					CPU_MASK_ALL : \