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 */