[amd64, i386]: Enable ACPI_SYSFS_POWER and disable ACPI_PROCFS_POWER.

with both enabled one battery shows up twice in hal.
the procfs /proc/acpi/battery/BAT0/info is the deprecated one.
sysfs info is found in /sys/class/power_supply/BAT0/

hal already shows enough info via sysfs, put pressure on hal
gnome-power-manager and friends to generalise their calculations.

svn path=/dists/trunk/linux-2.6/; revision=10165
This commit is contained in:
Maximilian Attems 2008-01-22 19:28:56 +00:00
parent 2d576895af
commit 77ad3464f1
3 changed files with 8 additions and 3 deletions

5
debian/changelog vendored
View File

@ -8,7 +8,10 @@ linux-2.6 (2.6.24~rc8-1~experimental.2) UNRELEASED; urgency=low
* Disable ATH5K on ARM since it fails to compile.
* [arm/iop32x] Activate DMADEVICES.
-- Martin Michlmayr <tbm@cyrius.com> Sat, 19 Jan 2008 19:23:50 +0100
[ maximilian attems ]
* [amd64, i386]: Enable ACPI_SYSFS_POWER and disable ACPI_PROCFS_POWER.
-- maximilian attems <maks@debian.org> Tue, 22 Jan 2008 20:22:43 +0100
linux-2.6 (2.6.24~rc8-1~experimental.1) experimental; urgency=low

View File

@ -37,7 +37,8 @@ CONFIG_PM_STD_PARTITION=""
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_PROCFS=y
CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_SYSFS_POWER=y
# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_PROC_EVENT=y
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m

View File

@ -58,7 +58,8 @@ CONFIG_PM_STD_PARTITION=""
CONFIG_ACPI=y
CONFIG_ACPI_SLEEP=y
CONFIG_ACPI_PROCFS=y
CONFIG_ACPI_PROCFS_POWER=y
CONFIG_ACPI_SYSFS_POWER=y
# CONFIG_ACPI_PROCFS_POWER is not set
CONFIG_ACPI_PROC_EVENT=y
CONFIG_ACPI_AC=m
CONFIG_ACPI_BATTERY=m