| Message ID | 1363902674-6456-7-git-send-email-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Mar 21, 2013 at 10:51 PM, Arnd Bergmann <arnd@arndb.de> wrote: > These got missed in the treewide changes because they came in through > a new branch, and it now breaks allmodconfig builds. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Linus Walleij <linus.walleij@linaro.org> Anton can you pick this fix directly to the power subsystem tree? Yours, Linus Walleij
On Fri, Mar 22, 2013 at 01:14:55PM +0100, Linus Walleij wrote: > On Thu, Mar 21, 2013 at 10:51 PM, Arnd Bergmann <arnd@arndb.de> wrote: > > > These got missed in the treewide changes because they came in through > > a new branch, and it now breaks allmodconfig builds. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Acked-by: Linus Walleij <linus.walleij@linaro.org> > > Anton can you pick this fix directly to the power subsystem > tree? Yup, will do. Thanks! Anton
On Fri, Mar 22, 2013 at 01:14:55PM +0100, Linus Walleij wrote: > On Thu, Mar 21, 2013 at 10:51 PM, Arnd Bergmann <arnd@arndb.de> wrote: > > > These got missed in the treewide changes because they came in through > > a new branch, and it now breaks allmodconfig builds. > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > Acked-by: Linus Walleij <linus.walleij@linaro.org> > > Anton can you pick this fix directly to the power subsystem > tree? It appears that Lars-Peter Clausen sent a similar patch a bit earlier. I added Arnd's Signed-off-by to give a credit, though. So, it is in battery-urgent now. Thanks! Anton
diff --git a/drivers/power/pm2301_charger.c b/drivers/power/pm2301_charger.c index ed48d75..ca424b8 100644 --- a/drivers/power/pm2301_charger.c +++ b/drivers/power/pm2301_charger.c @@ -851,7 +851,7 @@ static int pm2xxx_wall_charger_suspend(struct i2c_client *i2c_client, return 0; } -static int __devinit pm2xxx_wall_charger_probe(struct i2c_client *i2c_client, +static int pm2xxx_wall_charger_probe(struct i2c_client *i2c_client, const struct i2c_device_id *id) { struct pm2xxx_platform_data *pl_data = i2c_client->dev.platform_data; @@ -1021,7 +1021,7 @@ free_device_info: return ret; } -static int __devexit pm2xxx_wall_charger_remove(struct i2c_client *i2c_client) +static int pm2xxx_wall_charger_remove(struct i2c_client *i2c_client) { struct pm2xxx_charger *pm2 = i2c_get_clientdata(i2c_client); @@ -1058,7 +1058,7 @@ MODULE_DEVICE_TABLE(i2c, pm2xxx_id); static struct i2c_driver pm2xxx_charger_driver = { .probe = pm2xxx_wall_charger_probe, - .remove = __devexit_p(pm2xxx_wall_charger_remove), + .remove = pm2xxx_wall_charger_remove, .suspend = pm2xxx_wall_charger_suspend, .resume = pm2xxx_wall_charger_resume, .driver = {
These got missed in the treewide changes because they came in through a new branch, and it now breaks allmodconfig builds. Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- drivers/power/pm2301_charger.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)