diff options
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/Kconfig | 6 | ||||
-rw-r--r-- | drivers/acpi/Makefile | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 66c60982ba46..14b70c259f3e 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
@@ -43,10 +43,6 @@ config ACPI | |||
43 | 43 | ||
44 | if ACPI | 44 | if ACPI |
45 | 45 | ||
46 | config ACPI_BOOT | ||
47 | bool | ||
48 | default y | ||
49 | |||
50 | config ACPI_INTERPRETER | 46 | config ACPI_INTERPRETER |
51 | bool | 47 | bool |
52 | default y | 48 | default y |
@@ -312,7 +308,7 @@ endif # ACPI_INTERPRETER | |||
312 | config X86_PM_TIMER | 308 | config X86_PM_TIMER |
313 | bool "Power Management Timer Support" | 309 | bool "Power Management Timer Support" |
314 | depends on X86 | 310 | depends on X86 |
315 | depends on ACPI_BOOT && EXPERIMENTAL | 311 | depends on EXPERIMENTAL |
316 | depends on !X86_64 | 312 | depends on !X86_64 |
317 | default n | 313 | default n |
318 | help | 314 | help |
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index ad67e8f61e6c..952ab352af9e 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile | |||
@@ -15,7 +15,7 @@ EXTRA_CFLAGS += $(ACPI_CFLAGS) | |||
15 | # | 15 | # |
16 | # ACPI Boot-Time Table Parsing | 16 | # ACPI Boot-Time Table Parsing |
17 | # | 17 | # |
18 | obj-$(CONFIG_ACPI_BOOT) += tables.o | 18 | obj-y += tables.o |
19 | obj-$(CONFIG_ACPI_INTERPRETER) += blacklist.o | 19 | obj-$(CONFIG_ACPI_INTERPRETER) += blacklist.o |
20 | 20 | ||
21 | # | 21 | # |