diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 10:21:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 10:21:59 -0400 |
| commit | 6a4b170c54289f427645019c52d1b9c871a6661e (patch) | |
| tree | e129355a1e07a6ee7f24a3df1fdb59906f733bf4 /arch/x86_64/kernel/genapic.c | |
| parent | eccdfcd6f8265300380fa14a83aeb14e69830323 (diff) | |
| parent | 64e47488c913ac704d465a6af86a26786d1412a5 (diff) | |
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
Diffstat (limited to 'arch/x86_64/kernel/genapic.c')
| -rw-r--r-- | arch/x86_64/kernel/genapic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/genapic.c b/arch/x86_64/kernel/genapic.c index f062aa03bab7..b1c144f73149 100644 --- a/arch/x86_64/kernel/genapic.c +++ b/arch/x86_64/kernel/genapic.c | |||
| @@ -20,7 +20,7 @@ | |||
| 20 | #include <asm/smp.h> | 20 | #include <asm/smp.h> |
| 21 | #include <asm/ipi.h> | 21 | #include <asm/ipi.h> |
| 22 | 22 | ||
| 23 | #if defined(CONFIG_ACPI_BUS) | 23 | #if defined(CONFIG_ACPI) |
| 24 | #include <acpi/acpi_bus.h> | 24 | #include <acpi/acpi_bus.h> |
| 25 | #endif | 25 | #endif |
| 26 | 26 | ||
| @@ -47,7 +47,7 @@ void __init clustered_apic_check(void) | |||
| 47 | u8 cluster_cnt[NUM_APIC_CLUSTERS]; | 47 | u8 cluster_cnt[NUM_APIC_CLUSTERS]; |
| 48 | int num_cpus = 0; | 48 | int num_cpus = 0; |
| 49 | 49 | ||
| 50 | #if defined(CONFIG_ACPI_BUS) | 50 | #if defined(CONFIG_ACPI) |
| 51 | /* | 51 | /* |
| 52 | * Some x86_64 machines use physical APIC mode regardless of how many | 52 | * Some x86_64 machines use physical APIC mode regardless of how many |
| 53 | * procs/clusters are present (x86_64 ES7000 is an example). | 53 | * procs/clusters are present (x86_64 ES7000 is an example). |