Commit 15e88699 authored by Chris Wedgwood's avatar Chris Wedgwood Committed by Linus Torvalds

[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: default avatarChris Wedgwood <cw@f00f.org>
Acked-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9c7d3b3a
...@@ -608,9 +608,11 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size) ...@@ -608,9 +608,11 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
acpi_fadt.sci_int = fadt->sci_int; acpi_fadt.sci_int = fadt->sci_int;
#endif #endif
#ifdef CONFIG_ACPI_BUS
/* initialize rev and apic_phys_dest_mode for x86_64 genapic */ /* initialize rev and apic_phys_dest_mode for x86_64 genapic */
acpi_fadt.revision = fadt->revision; acpi_fadt.revision = fadt->revision;
acpi_fadt.force_apic_physical_destination_mode = fadt->force_apic_physical_destination_mode; acpi_fadt.force_apic_physical_destination_mode = fadt->force_apic_physical_destination_mode;
#endif
#ifdef CONFIG_X86_PM_TIMER #ifdef CONFIG_X86_PM_TIMER
/* detect the location of the ACPI PM Timer */ /* detect the location of the ACPI PM Timer */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment