summaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel/setup.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-24 18:09:07 +0200
committerLen Brown <len.brown@intel.com>2005-08-24 18:10:43 +0200
commit8466361ad5233d4356a4601e16b66c25277920d1 (patch)
tree2632aaa6e21a40e0fc94d7de6e8b738836585e4a /arch/i386/kernel/setup.c
parent[ACPI] delete CONFIG_ACPI_BOOT (diff)
downloadlinux-8466361ad5233d4356a4601e16b66c25277920d1.tar.xz
linux-8466361ad5233d4356a4601e16b66c25277920d1.zip
[ACPI] delete CONFIG_ACPI_INTERPRETER
it is a synonym for CONFIG_ACPI Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/i386/kernel/setup.c')
-rw-r--r--arch/i386/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index d3943e5edc8f..d52eda399a7a 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -87,7 +87,7 @@ EXPORT_SYMBOL(boot_cpu_data);
unsigned long mmu_cr4_features;
-#ifdef CONFIG_ACPI_INTERPRETER
+#ifdef CONFIG_ACPI
int acpi_disabled = 0;
#else
int acpi_disabled = 1;