[ACPI] x86_64 build fix

Signed-off-by: Andrew Morton <akpm@osdl.org>

diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index d4e3cfef904216a82d97337f27736260b87aa71d..7c98f57b9a9a83f72eb07165fdd79d30765c6b7b 100644 (file)
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -71,7 +71,7 @@ EXPORT_SYMBOL(acpi_disabled);
 #ifdef CONFIG_ACPI_BOOT
 extern int __initdata acpi_ht;
 extern acpi_interrupt_flags    acpi_sci_flags;
-/* int __initdata acpi_force = 0; */
+int __initdata acpi_force = 0;
 #endif
 
 /* For PCI or other memory-mapped resources */
@@ -248,14 +248,14 @@ static __init void parse_cmdline_early (char ** cmdline_p)
 
                if (!memcmp(from, "acpi=force", 10)) { 
                        /* add later when we do DMI horrors: */
-                       /* acpi_force = 1; */   
+                       acpi_force = 1;
                        acpi_disabled = 0;
                }
 
                /* acpi=ht just means: do ACPI MADT parsing 
                   at bootup, but don't enable the full ACPI interpreter */
                if (!memcmp(from, "acpi=ht", 7)) { 
-                       /* if (!acpi_force) */
+                       if (!acpi_force)
                                disable_acpi();
                        acpi_ht = 1; 
                }