Merge master.kernel.org:/pub/scm/linux/kernel/git/lenb/to-linus

[linux-2.6] / include / asm-ppc64 / topology.h

diff --git a/include/asm-ppc64/topology.h b/include/asm-ppc64/topology.h
index d58d9dd799980b05cff9f79eb6db95e0e1a89639..fcdcfd26a26bcbc41b6ed18cfd4e3c98bade84f4 100644 (file)
--- 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 */