diff options
| author | Dave Jones <davej@redhat.com> | 2011-10-14 13:13:34 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2011-10-14 13:13:46 -0400 |
| commit | 3e1637b65790f195c6936e5b4e443c5ca9f37ed4 (patch) | |
| tree | 09cfc91bb16b8b41245de6c0893328db00e364ce /config-ia64-generic | |
| parent | 04203df13cd45f0fb154538cb9c34eb294e1d6e6 (diff) | |
| download | kernel-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."
Diffstat (limited to 'config-ia64-generic')
| -rw-r--r-- | config-ia64-generic | 3 |
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 |