aboutsummaryrefslogtreecommitdiff
path: root/arch/i386/kernel/acpi
diff options
context:
space:
mode:
authorChris Wedgwood <cw@f00f.org>2005-04-18 08:01:30 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-18 08:01:30 -0700
commit15e8869943060780b79b242851b0692286fc7d18 (patch)
tree192c399c6bfb0a04b65e47332b3d9a0b10b852b8 /arch/i386/kernel/acpi
parent9c7d3b3a6b6aaeded9d9e5c5111dbcc65b0b0f91 (diff)
[PATCH] x86: fix acpi compile without CONFIG_ACPI_BUS
The recent acpi boot patch breaks for me: acpi_fadt needs CONFIG_ACPI_BUS. Signed-off-By: Chris Wedgwood <cw@f00f.org> Acked-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/kernel/acpi')
-rw-r--r--arch/i386/kernel/acpi/boot.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 040451e90a0..53eb5cfd5b6 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -608,9 +608,11 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
acpi_fadt.sci_int = fadt->sci_int;
#endif
+#ifdef CONFIG_ACPI_BUS
/* initialize rev and apic_phys_dest_mode for x86_64 genapic */
acpi_fadt.revision = fadt->revision;
acpi_fadt.force_apic_physical_destination_mode = fadt->force_apic_physical_destination_mode;
+#endif
#ifdef CONFIG_X86_PM_TIMER
/* detect the location of the ACPI PM Timer */