diff options
| author |   Tony Luck <tony.luck@intel.com> | 2006-03-21 08:16:21 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-03-21 08:16:21 -0800 |
| commit | 536ea4e4198eeaa5a73fb734ea675e621609bb7e (patch) | |
| tree | 321384a2233413d7df5f00b3356116c8b05ef08d /arch/ia64/kernel/topology.c | |
| parent | Linux 2.6.16 (diff) | |
| parent | [IA64] Fix UP build with BSP removal support. (diff) | |
| download | linux-dev-536ea4e4198eeaa5a73fb734ea675e621609bb7e.tar.xz linux-dev-536ea4e4198eeaa5a73fb734ea675e621609bb7e.zip | |
Pull bsp-removal into release branch
Diffstat (limited to 'arch/ia64/kernel/topology.c')
| -rw-r--r-- | arch/ia64/kernel/topology.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index 6e5eea19fa67..3b6fd798c4d6 100644 --- a/arch/ia64/kernel/topology.c +++ b/arch/ia64/kernel/topology.c @@ -36,7 +36,7 @@ int arch_register_cpu(int num) parent = &sysfs_nodes[cpu_to_node(num)]; #endif /* CONFIG_NUMA */ -#ifdef CONFIG_ACPI +#if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU) /* * If CPEI cannot be re-targetted, and this is * CPEI target, then dont create the control file |