Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6

git-mirror · Jul 16, 2005 · d6e1860 · d6e1860
2 parents 38d84c3 + 46906c4
commit d6e1860
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
@@ -36,12 +36,14 @@ int arch_register_cpu(int num)
 	parent = &sysfs_nodes[cpu_to_node(num)];
 #endif /* CONFIG_NUMA */
 
+#ifdef CONFIG_ACPI_BOOT
 	/*
 	 * If CPEI cannot be re-targetted, and this is
 	 * CPEI target, then dont create the control file
 	 */
 	if (!can_cpei_retarget() && is_cpu_cpei_target(num))
 		sysfs_cpus[num].cpu.no_control = 1;
+#endif
 
 	return register_cpu(&sysfs_cpus[num].cpu, num, parent);
 }