diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-03-21 11:16:21 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-03-21 11:16:21 -0500 |
| commit | 536ea4e4198eeaa5a73fb734ea675e621609bb7e (patch) | |
| tree | 321384a2233413d7df5f00b3356116c8b05ef08d /arch/ia64/kernel/topology.c | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
| parent | b88e926584bf100bc23f5e76b7b674d4257edcb0 (diff) | |
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) | |||
| 36 | parent = &sysfs_nodes[cpu_to_node(num)]; | 36 | parent = &sysfs_nodes[cpu_to_node(num)]; |
| 37 | #endif /* CONFIG_NUMA */ | 37 | #endif /* CONFIG_NUMA */ |
| 38 | 38 | ||
| 39 | #ifdef CONFIG_ACPI | 39 | #if defined (CONFIG_ACPI) && defined (CONFIG_HOTPLUG_CPU) |
| 40 | /* | 40 | /* |
| 41 | * If CPEI cannot be re-targetted, and this is | 41 | * If CPEI cannot be re-targetted, and this is |
| 42 | * CPEI target, then dont create the control file | 42 | * CPEI target, then dont create the control file |