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

[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

arch/i386/kernel/acpi/boot.c

+2 −0
Original line number Diff line number Diff line
@@ -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 */