diff options
author | Len Brown <len.brown@intel.com> | 2005-08-24 12:07:20 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2005-08-24 12:08:54 -0400 |
commit | 888ba6c62bc61a995d283977eb3a6cbafd6f4ac6 (patch) | |
tree | 2a1614a7c63460e98f55ac5905f3a4be679138f1 /arch/ia64/configs/zx1_defconfig | |
parent | 84ffa747520edd4556b136bdfc9df9eb1673ce12 (diff) |
[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/ia64/configs/zx1_defconfig')
-rw-r--r-- | arch/ia64/configs/zx1_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig index 88e8867fa8e8..cf58404769a8 100644 --- a/arch/ia64/configs/zx1_defconfig +++ b/arch/ia64/configs/zx1_defconfig | |||
@@ -128,7 +128,6 @@ CONFIG_ACPI=y | |||
128 | # | 128 | # |
129 | # ACPI (Advanced Configuration and Power Interface) Support | 129 | # ACPI (Advanced Configuration and Power Interface) Support |
130 | # | 130 | # |
131 | CONFIG_ACPI_BOOT=y | ||
132 | CONFIG_ACPI_INTERPRETER=y | 131 | CONFIG_ACPI_INTERPRETER=y |
133 | CONFIG_ACPI_BUTTON=y | 132 | CONFIG_ACPI_BUTTON=y |
134 | CONFIG_ACPI_VIDEO=m | 133 | CONFIG_ACPI_VIDEO=m |