Hi all, After merging the final tree, today's linux-next build (powerpc allyesconfig, i386 defconfig) failed like this: drivers/power/power_supply_core.c:204:6: error: too few arguments to function 'thermal_zone_device_register' Caused by commit a9e7402dd2e4 ("ACPI-Thermal: Make Thermal trip points writeable") from the acpi tree interacting with commit 3be330bf8860 ("power_supply: Register battery as a thermal zone") from the battery tree. I have added the following patch and will carry it as a merge fix to the battery tree: From: Stephen Rothwell Date: Tue, 19 Jun 2012 14:46:17 +1000 Subject: [PATCH] ACPI-Thermal: fix for an API change Signed-off-by: Stephen Rothwell --- drivers/power/power_supply_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c index ff990d2..85689fb 100644 --- a/drivers/power/power_supply_core.c +++ b/drivers/power/power_supply_core.c @@ -201,7 +201,7 @@ static int psy_register_thermal(struct power_supply *psy) for (i = 0; i < psy->num_properties; i++) { if (psy->properties[i] == POWER_SUPPLY_PROP_TEMP) { psy->tzd = thermal_zone_device_register(psy->name, 0, - psy, &psy_tzd_ops, 0, 0, 0, 0); + 0, psy, &psy_tzd_ops, 0, 0, 0, 0); if (IS_ERR(psy->tzd)) return PTR_ERR(psy->tzd); break; -- 1.7.10.280.gaa39 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au