---

yaml --- r: 242 b: refs/heads/master c: 15e8869 h: refs/heads/master v: v3
git-mirror · Apr 18, 2005 · e5c5084 · e5c5084
1 parent ab75b78
commit e5c5084
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c7d3b3a6b6aaeded9d9e5c5111dbcc65b0b0f91
+refs/heads/master: 15e8869943060780b79b242851b0692286fc7d18
diff --git a/trunk/arch/i386/kernel/acpi/boot.c b/trunk/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 */