summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAlexander Nyberg <alexn@telia.com>2005-05-31 14:39:27 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-31 14:54:17 -0700
commitadaa765d76f58b47e10a4760f2c0bc86de5479b9 (patch)
tree49db01681b5061228bd5a15f7ac0f9eab54601c6 /arch
parent9c2be6a0fa186e2cb0cf14f41f20b08a5809a026 (diff)
downloadlinux-adaa765d76f58b47e10a4760f2c0bc86de5479b9.tar.bz2
[PATCH] acpi build fix: x86 setup.c
This is a neverending story linux/acpi.h contains empty declarations for acpi_boot_init() & acpi_boot_table_init() but they are nested inside #ifdef CONFIG_ACPI. So we'll have to #ifdef in arch/i386/kernel/setup.c: setup_arch() Signed-off-by: Alexander Nyberg <alexn@telia.com> Cc: "Brown, Len" <len.brown@intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/kernel/setup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 945ec73163c8..2bfbddebdbf8 100644
--- a/arch/i386/kernel/setup.c
+++ b/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)