Author: maks Date: Tue Jan 22 19:28:56 2008 New Revision: 10165 Log: [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. Modified: dists/trunk/linux-2.6/debian/changelog dists/trunk/linux-2.6/debian/config/amd64/config dists/trunk/linux-2.6/debian/config/i386/config Modified: dists/trunk/linux-2.6/debian/changelog ============================================================================== --- dists/trunk/linux-2.6/debian/changelog (original) +++ dists/trunk/linux-2.6/debian/changelog Tue Jan 22 19:28:56 2008 @@ -8,7 +8,10 @@ * Disable ATH5K on ARM since it fails to compile. * [arm/iop32x] Activate DMADEVICES. - -- Martin Michlmayr <[EMAIL PROTECTED]> Sat, 19 Jan 2008 19:23:50 +0100 + [ maximilian attems ] + * [amd64, i386]: Enable ACPI_SYSFS_POWER and disable ACPI_PROCFS_POWER. + + -- maximilian attems <[EMAIL PROTECTED]> Tue, 22 Jan 2008 20:22:43 +0100 linux-2.6 (2.6.24~rc8-1~experimental.1) experimental; urgency=low Modified: dists/trunk/linux-2.6/debian/config/amd64/config ============================================================================== --- dists/trunk/linux-2.6/debian/config/amd64/config (original) +++ dists/trunk/linux-2.6/debian/config/amd64/config Tue Jan 22 19:28:56 2008 @@ -37,7 +37,8 @@ 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 Modified: dists/trunk/linux-2.6/debian/config/i386/config ============================================================================== --- dists/trunk/linux-2.6/debian/config/i386/config (original) +++ dists/trunk/linux-2.6/debian/config/i386/config Tue Jan 22 19:28:56 2008 @@ -58,7 +58,8 @@ 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 _______________________________________________ Kernel-svn-changes mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/kernel-svn-changes
