summaryrefslogtreecommitdiffstats
path: root/arch/i386/defconfig
diff options
context:
space:
mode:
authorLen Brown2005-08-24 18:07:20 +0200
committerLen Brown2005-08-24 18:08:54 +0200
commit888ba6c62bc61a995d283977eb3a6cbafd6f4ac6 (patch)
tree2a1614a7c63460e98f55ac5905f3a4be679138f1 /arch/i386/defconfig
parentMerge from-linus to-akpm (diff)
downloadkernel-qcow2-linux-888ba6c62bc61a995d283977eb3a6cbafd6f4ac6.tar.gz
kernel-qcow2-linux-888ba6c62bc61a995d283977eb3a6cbafd6f4ac6.tar.xz
kernel-qcow2-linux-888ba6c62bc61a995d283977eb3a6cbafd6f4ac6.zip
[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>
Diffstat (limited to 'arch/i386/defconfig')
-rw-r--r--arch/i386/defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index ca07b95c06b8..1c0076e22dda 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -131,7 +131,6 @@ CONFIG_SOFTWARE_SUSPEND=y
# ACPI (Advanced Configuration and Power Interface) Support
#
CONFIG_ACPI=y
-CONFIG_ACPI_BOOT=y
CONFIG_ACPI_INTERPRETER=y
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_SLEEP_PROC_FS=y