From: Chris Wedgwood Date: Mon, 18 Apr 2005 15:01:30 +0000 (-0700) Subject: [PATCH] x86: fix acpi compile without CONFIG_ACPI_BUS X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=15e8869943060780b79b242851b0692286fc7d18;p=openwrt%2Fstaging%2Fblogic.git [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 Acked-by: Andi Kleen Signed-off-by: Linus Torvalds --- diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 040451e90a04..53eb5cfd5b63 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 */