diff --git a/[refs] b/[refs]
index 9eaf9e8c4376..99f6e3ec3844 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ade43fbbcc3c12f0ddba112351d14d6c82ae476
+refs/heads/master: 561fb765b97f287211a2c73a844c5edb12f44f1d
diff --git a/trunk/include/asm-ppc64/topology.h b/trunk/include/asm-ppc64/topology.h
index fcdcfd26a26b..1e9b19073230 100644
--- a/trunk/include/asm-ppc64/topology.h
+++ b/trunk/include/asm-ppc64/topology.h
@@ -33,6 +33,7 @@ static inline int node_to_first_cpu(int node)
 	return first_cpu(tmp);
 }
 
+#define pcibus_to_node(node)    (-1)
 #define pcibus_to_cpumask(bus)	(cpu_online_map)
 
 #define nr_cpus_node(node)	(nr_cpus_in_node[node])
@@ -59,8 +60,10 @@ static inline int node_to_first_cpu(int node)
 	.nr_balance_failed	= 0,			\
 }
 
-#endif /* CONFIG_NUMA */
+#else
 
 #include <asm-generic/topology.h>
 
+#endif /* CONFIG_NUMA */
+
 #endif /* _ASM_PPC64_TOPOLOGY_H */