summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic
index e1d81cfd6..2e4cc0a3b 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -59,7 +59,6 @@ CONFIG_DEBUG_STACKOVERFLOW=y
CONFIG_ACPI=y
CONFIG_ACPI_AC=y
# CONFIG_ACPI_ASUS is not set
-CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_BATTERY=y
CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_CONTAINER=m
@@ -73,6 +72,8 @@ CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_THERMAL=y
CONFIG_ACPI_TOSHIBA=m
CONFIG_ACPI_VIDEO=m
+# FIXME: Next two are deprecated. Remove them when they disappear upstream
+# CONFIG_ACPI_PROCFS_POWER is not set
# CONFIG_ACPI_PROC_EVENT is not set
CONFIG_PNPACPI=y
CONFIG_ACPI_PROCESSOR_AGGREGATOR=m