summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Jones <davej@redhat.com>2011-10-14 13:13:34 -0400
committerDave Jones <davej@redhat.com>2011-10-14 13:13:46 -0400
commit3e1637b65790f195c6936e5b4e443c5ca9f37ed4 (patch)
tree09cfc91bb16b8b41245de6c0893328db00e364ce
parent04203df13cd45f0fb154538cb9c34eb294e1d6e6 (diff)
downloadkernel-3e1637b65790f195c6936e5b4e443c5ca9f37ed4.tar.gz
kernel-3e1637b65790f195c6936e5b4e443c5ca9f37ed4.tar.xz
kernel-3e1637b65790f195c6936e5b4e443c5ca9f37ed4.zip
Disable CONFIG_ACPI_PROCFS_POWER which is supposed to be going away soon.
"This option, together with the proc directories, will be deleted in 2.6.39."
-rw-r--r--config-ia64-generic3
-rw-r--r--config-x86-generic3
-rw-r--r--kernel.spec3
3 files changed, 7 insertions, 2 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
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
diff --git a/kernel.spec b/kernel.spec
index 3177e86c9..9d8f2118d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2066,6 +2066,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Oct 14 2011 Dave Jones <davej@redhat.com>
+- Disable CONFIG_ACPI_PROCFS_POWER which is supposed to be going away soon.
+
* Thu Oct 13 2011 Josh Boyer <jwboyer@redhat.com>
- Update usb-add-quirk-for-logitech-webcams.patch with C600 ID (rhbz 742010)