diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-16 02:52:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-16 02:52:13 +0200 |
| commit | d6e1860312cd8c33ad1f17d1af22fb6aa1f2cf83 (patch) | |
| tree | e31e6ec7a1d9e8f6bbf8cdee2692eb42f4869f47 /arch | |
| parent | [PATCH] dvb: cx88 output mode fix (diff) | |
| parent | [IA64] Fix undefined reference to can_cpei_retarget for simulator (diff) | |
| download | linux-d6e1860312cd8c33ad1f17d1af22fb6aa1f2cf83.tar.xz linux-d6e1860312cd8c33ad1f17d1af22fb6aa1f2cf83.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/kernel/topology.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c index d8030f3bd865..92ff46ad21e2 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); } |