diff --git a/[refs] b/[refs] index b981d9dd519a..6d93752a606d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd19c756b1a69ec2c8f5f81624d66a1a0daad7c0 +refs/heads/master: 0bea4b866448af09051e357b139f598aa70b8614 diff --git a/trunk/drivers/power/ds2780_battery.c b/trunk/drivers/power/ds2780_battery.c index 1fefe82e12e3..ed25ef5887d4 100644 --- a/trunk/drivers/power/ds2780_battery.c +++ b/trunk/drivers/power/ds2780_battery.c @@ -832,7 +832,7 @@ static struct platform_driver ds2780_battery_driver = { .name = "ds2780-battery", }, .probe = ds2780_battery_probe, - .remove = ds2780_battery_remove, + .remove = __devexit_p(ds2780_battery_remove), }; static int __init ds2780_battery_init(void) diff --git a/trunk/drivers/power/z2_battery.c b/trunk/drivers/power/z2_battery.c index d119c38b3ff6..ae38c44ccd4e 100644 --- a/trunk/drivers/power/z2_battery.c +++ b/trunk/drivers/power/z2_battery.c @@ -313,7 +313,7 @@ static struct i2c_driver z2_batt_driver = { .pm = Z2_BATTERY_PM_OPS }, .probe = z2_batt_probe, - .remove = z2_batt_remove, + .remove = __devexit_p(z2_batt_remove), .id_table = z2_batt_id, };