Convert from class_device to device for drivers/video

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

diff --git a/include/asm-sparc64/topology.h b/include/asm-sparc64/topology.h
index 4880f7ca0b608d300a05d4c9c299aa70cb0a4280..290ac75f385bee443a24eb9bba11fb70783edc46 100644 (file)
--- a/include/asm-sparc64/topology.h
+++ b/include/asm-sparc64/topology.h
@@ -2,14 +2,12 @@
 #define _ASM_SPARC64_TOPOLOGY_H
 
 #ifdef CONFIG_SMP
-#include <asm/spitfire.h>
-
 #define topology_physical_package_id(cpu)      (cpu_data(cpu).proc_id)
 #define topology_core_id(cpu)                  (cpu_data(cpu).core_id)
 #define topology_core_siblings(cpu)            (cpu_core_map[cpu])
 #define topology_thread_siblings(cpu)          (cpu_sibling_map[cpu])
-#define mc_capable()                           (tlb_type == hypervisor)
-#define smt_capable()                          (tlb_type == hypervisor)
+#define mc_capable()                           (sparc64_multi_core)
+#define smt_capable()                          (sparc64_multi_core)
 #endif /* CONFIG_SMP */
 
 #include <asm-generic/topology.h>