--- zzzz-none-000/linux-2.6.19.2/include/asm-powerpc/topology.h	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5504/linux-2.6.19.2/include/asm-powerpc/topology.h	2007-01-11 07:38:19.000000000 +0000
@@ -96,13 +96,7 @@
 
 #ifdef CONFIG_SMP
 #include <asm/cputable.h>
-#define smt_capable()		(cpu_has_feature(CPU_FTR_SMT))
-
-#ifdef CONFIG_PPC64
-#include <asm/smp.h>
-
-#define topology_thread_siblings(cpu)	(cpu_sibling_map[cpu])
-#endif
+#define smt_capable() 		(cpu_has_feature(CPU_FTR_SMT))
 #endif
 
 #endif /* __KERNEL__ */