diff options
author | Christoph Lameter <christoph@lameter.com> | 2005-06-23 03:08:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 12:45:08 -0400 |
commit | e164f5573bef0e6caf53519719cf0228c9c15ce3 (patch) | |
tree | beb6820d42219d34fb83b008de774cebd5e7bac8 | |
parent | 4a35293667f8691b45fdb72770f087c086fb9702 (diff) |
[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>
-rw-r--r-- | include/asm-ppc64/topology.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-ppc64/topology.h b/include/asm-ppc64/topology.h index d58d9dd79998..fcdcfd26a26b 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) | |||
59 | .nr_balance_failed = 0, \ | 59 | .nr_balance_failed = 0, \ |
60 | } | 60 | } |
61 | 61 | ||
62 | #else /* !CONFIG_NUMA */ | 62 | #endif /* CONFIG_NUMA */ |
63 | 63 | ||
64 | #include <asm-generic/topology.h> | 64 | #include <asm-generic/topology.h> |
65 | 65 | ||
66 | #endif /* CONFIG_NUMA */ | ||
67 | |||
68 | #endif /* _ASM_PPC64_TOPOLOGY_H */ | 66 | #endif /* _ASM_PPC64_TOPOLOGY_H */ |