From: Ian Wienand <ianw@gelato.unsw.edu.au>
Date: Thu, 14 Jul 2005 04:09:00 +0000 (-0700)
Subject: [IA64] Fix undefined reference to can_cpei_retarget for simulator
X-Git-Tag: v2.6.13-rc4~92^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=46906c4415f88cebfad530917bada0835d651824;p=linux-2.6-omap-h63xx.git

[IA64] Fix undefined reference to can_cpei_retarget for simulator

The simulator build doesn't turn on ACPI, so doesn't have a definition
of can_cpei_retarget.

Signed-off-by: Tony Luck <tony.luck@intel.com>
---

diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index d8030f3bd86..92ff46ad21e 100644
--- 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);
 }