From: Christoph Lameter <christoph@lameter.com>
Date: Thu, 23 Jun 2005 07:08:17 +0000 (-0700)
Subject: [PATCH] ppc64: pcibus_to_node fix
X-Git-Tag: v2.6.13-rc4~130^2~119
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e164f5573bef0e6caf53519719cf0228c9c15ce3;p=linux-2.6-omap-h63xx.git

[PATCH] ppc64: pcibus_to_node fix

asm-generic/topology.h must also be included if CONFIG_NUMA is set in order to
provide the fall back pcibus_to_node function.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/include/asm-ppc64/topology.h b/include/asm-ppc64/topology.h
index d58d9dd7999..fcdcfd26a26 100644
--- a/include/asm-ppc64/topology.h
+++ b/include/asm-ppc64/topology.h
@@ -59,10 +59,8 @@ static inline int node_to_first_cpu(int node)
 	.nr_balance_failed	= 0,			\
 }
 
-#else /* !CONFIG_NUMA */
+#endif /* CONFIG_NUMA */
 
 #include <asm-generic/topology.h>
 
-#endif /* CONFIG_NUMA */
-
 #endif /* _ASM_PPC64_TOPOLOGY_H */