aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-24 12:07:20 -0400
committerLen Brown <len.brown@intel.com>2005-08-24 12:08:54 -0400
commit888ba6c62bc61a995d283977eb3a6cbafd6f4ac6 (patch)
tree2a1614a7c63460e98f55ac5905f3a4be679138f1 /drivers/acpi
parent84ffa747520edd4556b136bdfc9df9eb1673ce12 (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 'drivers/acpi')
-rw-r--r--drivers/acpi/Kconfig6
-rw-r--r--drivers/acpi/Makefile2
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 66c60982ba4..14b70c259f3 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -43,10 +43,6 @@ config ACPI
if ACPI
-config ACPI_BOOT
- bool
- default y
-
config ACPI_INTERPRETER
bool
default y
@@ -312,7 +308,7 @@ endif # ACPI_INTERPRETER
config X86_PM_TIMER
bool "Power Management Timer Support"
depends on X86
- depends on ACPI_BOOT && EXPERIMENTAL
+ depends on EXPERIMENTAL
depends on !X86_64
default n
help
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index ad67e8f61e6..952ab352af9 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -15,7 +15,7 @@ EXTRA_CFLAGS += $(ACPI_CFLAGS)
#
# ACPI Boot-Time Table Parsing
#
-obj-$(CONFIG_ACPI_BOOT) += tables.o
+obj-y += tables.o
obj-$(CONFIG_ACPI_INTERPRETER) += blacklist.o
#