From cb1093e042d7dbe2867ac8894fb9d250495effdf Mon Sep 17 00:00:00 2001
From: Alexander Nyberg <alexn@telia.com>
Date: Tue, 31 May 2005 14:39:27 -0700
Subject: [PATCH] --- yaml --- r: 1720 b: refs/heads/master c:
 adaa765d76f58b47e10a4760f2c0bc86de5479b9 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/i386/kernel/setup.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9b135d454b80..95b038af574a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c2be6a0fa186e2cb0cf14f41f20b08a5809a026
+refs/heads/master: adaa765d76f58b47e10a4760f2c0bc86de5479b9
diff --git a/trunk/arch/i386/kernel/setup.c b/trunk/arch/i386/kernel/setup.c
index 945ec73163c8..2bfbddebdbf8 100644
--- a/trunk/arch/i386/kernel/setup.c
+++ b/trunk/arch/i386/kernel/setup.c
@@ -1502,11 +1502,13 @@ void __init setup_arch(char **cmdline_p)
 	if (efi_enabled)
 		efi_map_memmap();
 
+#ifdef CONFIG_ACPI_BOOT
 	/*
 	 * Parse the ACPI tables for possible boot-time SMP configuration.
 	 */
 	acpi_boot_table_init();
 	acpi_boot_init();
+#endif
 
 #ifdef CONFIG_X86_LOCAL_APIC
 	if (smp_found_config)