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."
This commit is contained in:
Dave Jones 2011-10-14 13:13:34 -04:00
parent 04203df13c
commit 3e1637b657
3 changed files with 7 additions and 2 deletions

View File

@ -121,7 +121,6 @@ CONFIG_SERIAL_SGI_IOC4=m
CONFIG_ACPI=y CONFIG_ACPI=y
CONFIG_ACPI_AC=y CONFIG_ACPI_AC=y
# CONFIG_ACPI_ASUS is not set # CONFIG_ACPI_ASUS is not set
CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_SYSFS_POWER=y CONFIG_ACPI_SYSFS_POWER=y
# CONFIG_ACPI_BATTERY is not set # CONFIG_ACPI_BATTERY is not set
CONFIG_ACPI_BLACKLIST_YEAR=0 CONFIG_ACPI_BLACKLIST_YEAR=0
@ -137,7 +136,9 @@ CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_THERMAL=y CONFIG_ACPI_THERMAL=y
# CONFIG_ACPI_TOSHIBA is not set # CONFIG_ACPI_TOSHIBA is not set
CONFIG_ACPI_VIDEO=m CONFIG_ACPI_VIDEO=m
# FIXME: Next two are deprecated. Remove them when they disappear upstream
# CONFIG_ACPI_PROC_EVENT is not set # CONFIG_ACPI_PROC_EVENT is not set
# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_HED=m CONFIG_ACPI_HED=m
CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_EC_DEBUGFS=m
CONFIG_ACPI_IPMI=m CONFIG_ACPI_IPMI=m

View File

@ -59,7 +59,6 @@ CONFIG_DEBUG_STACKOVERFLOW=y
CONFIG_ACPI=y CONFIG_ACPI=y
CONFIG_ACPI_AC=y CONFIG_ACPI_AC=y
# CONFIG_ACPI_ASUS is not set # CONFIG_ACPI_ASUS is not set
CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_BATTERY=y CONFIG_ACPI_BATTERY=y
CONFIG_ACPI_BUTTON=y CONFIG_ACPI_BUTTON=y
CONFIG_ACPI_CONTAINER=m CONFIG_ACPI_CONTAINER=m
@ -73,6 +72,8 @@ CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_THERMAL=y CONFIG_ACPI_THERMAL=y
CONFIG_ACPI_TOSHIBA=m CONFIG_ACPI_TOSHIBA=m
CONFIG_ACPI_VIDEO=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_ACPI_PROC_EVENT is not set
CONFIG_PNPACPI=y CONFIG_PNPACPI=y
CONFIG_ACPI_PROCESSOR_AGGREGATOR=m CONFIG_ACPI_PROCESSOR_AGGREGATOR=m

View File

@ -2066,6 +2066,9 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %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> * Thu Oct 13 2011 Josh Boyer <jwboyer@redhat.com>
- Update usb-add-quirk-for-logitech-webcams.patch with C600 ID (rhbz 742010) - Update usb-add-quirk-for-logitech-webcams.patch with C600 ID (rhbz 742010)