[ACPI] delete CONFIG_ACPI_BOOT

it has been a synonym for CONFIG_ACPI since 2.6.12

Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index af4de58cab54..d3943e5edc8f 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -94,7 +94,7 @@ unsigned long mmu_cr4_features;
 #endif
 EXPORT_SYMBOL(acpi_disabled);
 
-#ifdef  CONFIG_ACPI_BOOT
+#ifdef  CONFIG_ACPI
 int __initdata acpi_force = 0;
 extern acpi_interrupt_flags     acpi_sci_flags;
 #endif
@@ -794,7 +794,7 @@ static void __init parse_cmdline_early (char ** cmdline_p)
                 }
 #endif
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
                 /* "acpi=off" disables both ACPI table parsing and interpreter */
                 else if (!memcmp(from, "acpi=off", 8)) {
                         disable_acpi();
@@ -850,7 +850,7 @@ static void __init parse_cmdline_early (char ** cmdline_p)
                 else if (!memcmp(from, "noapic", 6))
                         disable_ioapic_setup();
 #endif /* CONFIG_X86_LOCAL_APIC */
-#endif /* CONFIG_ACPI_BOOT */
+#endif /* CONFIG_ACPI */
 
 #ifdef CONFIG_X86_LOCAL_APIC
                 /* enable local APIC */
@@ -1575,7 +1575,7 @@ void __init setup_arch(char **cmdline_p)
         if (efi_enabled)
                 efi_map_memmap();
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
         /*
          * Parse the ACPI tables for possible boot-time SMP configuration.
          */