summaryrefslogtreecommitdiff
path: root/drivers/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2005-08-24 12:09:07 -0400
committerLen Brown <len.brown@intel.com>2005-08-24 12:10:43 -0400
commit8466361ad5233d4356a4601e16b66c25277920d1 (patch)
tree2632aaa6e21a40e0fc94d7de6e8b738836585e4a /drivers/acpi
parent888ba6c62bc61a995d283977eb3a6cbafd6f4ac6 (diff)
[ACPI] delete CONFIG_ACPI_INTERPRETER
it is a synonym for CONFIG_ACPI Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/Kconfig10
-rw-r--r--drivers/acpi/Makefile4
2 files changed, 2 insertions, 12 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 14b70c259f3..f023a88ca39 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -43,12 +43,6 @@ config ACPI
if ACPI
-config ACPI_INTERPRETER
- bool
- default y
-
-if ACPI_INTERPRETER
-
config ACPI_SLEEP
bool "Sleep States (EXPERIMENTAL)"
depends on X86 && (!SMP || SUSPEND_SMP)
@@ -126,7 +120,6 @@ config ACPI_VIDEO
config ACPI_HOTKEY
tristate "Generic Hotkey"
- depends on ACPI_INTERPRETER
depends on EXPERIMENTAL
depends on !IA64_SGI_SN
default n
@@ -257,7 +250,6 @@ config ACPI_CUSTOM_DSDT_FILE
config ACPI_BLACKLIST_YEAR
int "Disable ACPI for systems before Jan 1st this year"
- depends on ACPI_INTERPRETER
default 0
help
enter a 4-digit year, eg. 2001 to disable ACPI by default
@@ -303,8 +295,6 @@ config ACPI_SYSTEM
This driver will enable your system to shut down using ACPI, and
dump your ACPI DSDT table using /proc/acpi/dsdt.
-endif # ACPI_INTERPRETER
-
config X86_PM_TIMER
bool "Power Management Timer Support"
depends on X86
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 952ab352af9..060afaf962a 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -16,12 +16,12 @@ EXTRA_CFLAGS += $(ACPI_CFLAGS)
# ACPI Boot-Time Table Parsing
#
obj-y += tables.o
-obj-$(CONFIG_ACPI_INTERPRETER) += blacklist.o
+obj-y += blacklist.o
#
# ACPI Core Subsystem (Interpreter)
#
-obj-$(CONFIG_ACPI_INTERPRETER) += osl.o utils.o \
+obj-y += osl.o utils.o \
dispatcher/ events/ executer/ hardware/ \
namespace/ parser/ resources/ tables/ \
utilities/