aboutsummaryrefslogtreecommitdiffstats
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 14b70c259f3e..f023a88ca398 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -43,12 +43,6 @@ config ACPI
43 43
44if ACPI 44if ACPI
45 45
46config ACPI_INTERPRETER
47 bool
48 default y
49
50if ACPI_INTERPRETER
51
52config ACPI_SLEEP 46config ACPI_SLEEP
53 bool "Sleep States (EXPERIMENTAL)" 47 bool "Sleep States (EXPERIMENTAL)"
54 depends on X86 && (!SMP || SUSPEND_SMP) 48 depends on X86 && (!SMP || SUSPEND_SMP)
@@ -126,7 +120,6 @@ config ACPI_VIDEO
126 120
127config ACPI_HOTKEY 121config ACPI_HOTKEY
128 tristate "Generic Hotkey" 122 tristate "Generic Hotkey"
129 depends on ACPI_INTERPRETER
130 depends on EXPERIMENTAL 123 depends on EXPERIMENTAL
131 depends on !IA64_SGI_SN 124 depends on !IA64_SGI_SN
132 default n 125 default n
@@ -257,7 +250,6 @@ config ACPI_CUSTOM_DSDT_FILE
257 250
258config ACPI_BLACKLIST_YEAR 251config ACPI_BLACKLIST_YEAR
259 int "Disable ACPI for systems before Jan 1st this year" 252 int "Disable ACPI for systems before Jan 1st this year"
260 depends on ACPI_INTERPRETER
261 default 0 253 default 0
262 help 254 help
263 enter a 4-digit year, eg. 2001 to disable ACPI by default 255 enter a 4-digit year, eg. 2001 to disable ACPI by default
@@ -303,8 +295,6 @@ config ACPI_SYSTEM
303 This driver will enable your system to shut down using ACPI, and 295 This driver will enable your system to shut down using ACPI, and
304 dump your ACPI DSDT table using /proc/acpi/dsdt. 296 dump your ACPI DSDT table using /proc/acpi/dsdt.
305 297
306endif # ACPI_INTERPRETER
307
308config X86_PM_TIMER 298config X86_PM_TIMER
309 bool "Power Management Timer Support" 299 bool "Power Management Timer Support"
310 depends on X86 300 depends on X86
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 952ab352af9e..060afaf962a3 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -16,12 +16,12 @@ EXTRA_CFLAGS += $(ACPI_CFLAGS)
16# ACPI Boot-Time Table Parsing 16# ACPI Boot-Time Table Parsing
17# 17#
18obj-y += tables.o 18obj-y += tables.o
19obj-$(CONFIG_ACPI_INTERPRETER) += blacklist.o 19obj-y += blacklist.o
20 20
21# 21#
22# ACPI Core Subsystem (Interpreter) 22# ACPI Core Subsystem (Interpreter)
23# 23#
24obj-$(CONFIG_ACPI_INTERPRETER) += osl.o utils.o \ 24obj-y += osl.o utils.o \
25 dispatcher/ events/ executer/ hardware/ \ 25 dispatcher/ events/ executer/ hardware/ \
26 namespace/ parser/ resources/ tables/ \ 26 namespace/ parser/ resources/ tables/ \
27 utilities/ 27 utilities/