summaryrefslogtreecommitdiffstats
path: root/config-ia64-generic
diff options
context:
space:
mode:
Diffstat (limited to 'config-ia64-generic')
-rw-r--r--config-ia64-generic3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-ia64-generic b/config-ia64-generic
index 52900a8e7..1fa386d11 100644
--- a/config-ia64-generic
+++ b/config-ia64-generic
@@ -121,7 +121,6 @@ CONFIG_SERIAL_SGI_IOC4=m
CONFIG_ACPI=y
CONFIG_ACPI_AC=y
# CONFIG_ACPI_ASUS is not set
-CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_SYSFS_POWER=y
# CONFIG_ACPI_BATTERY is not set
CONFIG_ACPI_BLACKLIST_YEAR=0
@@ -137,7 +136,9 @@ CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_THERMAL=y
# CONFIG_ACPI_TOSHIBA is not set
CONFIG_ACPI_VIDEO=m
+# FIXME: Next two are deprecated. Remove them when they disappear upstream
# CONFIG_ACPI_PROC_EVENT is not set
+# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_HED=m
CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_IPMI=m