From 5c17fc297a979719ea8ee25b47eb0744c8871cc0 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <christoph@lameter.com>
Date: Thu, 23 Jun 2005 00:08:17 -0700
Subject: [PATCH] --- yaml --- r: 2879 b: refs/heads/master c:
 e164f5573bef0e6caf53519719cf0228c9c15ce3 h: refs/heads/master i:   2877:
 7f4767bdcae8b16af3c4d7f3a183d755c211a9f0   2875:
 39c298857deb6fd8696ce3e2ef0731945e21df9e   2871:
 89671df002bb13fcf8767110dd58013245fc34a4   2863:
 0aea3aa3ade3d7f01f153f2b3a0e49787e17167b   2847:
 8bcad39cc901bfafbd2a6b6682a805fe92d6b28c   2815:
 17249d34c5ac6cfd4db8e93358382ae22ec91cab v: v3

---
 [refs]                             | 2 +-
 trunk/include/asm-ppc64/topology.h | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index db3bb34b888c..ee77b05079e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a35293667f8691b45fdb72770f087c086fb9702
+refs/heads/master: e164f5573bef0e6caf53519719cf0228c9c15ce3
diff --git a/trunk/include/asm-ppc64/topology.h b/trunk/include/asm-ppc64/topology.h
index d58d9dd79998..fcdcfd26a26b 100644
--- a/trunk/include/asm-ppc64/topology.h
+++ b/trunk/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 */