Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux

The merge is merely to fix conflicts before sending a pull request.

Conflicts:
	drivers/power/ab8500_btemp.c
	drivers/power/ab8500_charger.c
	drivers/power/ab8500_fg.c
	drivers/power/abx500_chargalg.c
	drivers/power/max8925_power.c

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/power/max17042_battery.c b/drivers/power/max17042_battery.c
index 66b2c7b50914..d664ef58afa7 100644
--- a/drivers/power/max17042_battery.c
+++ b/drivers/power/max17042_battery.c
@@ -682,7 +682,7 @@ max17042_get_pdata(struct device *dev)
 }
 #endif
 
-static int __devinit max17042_probe(struct i2c_client *client,
+static int max17042_probe(struct i2c_client *client,
                         const struct i2c_device_id *id)
 {
         struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
@@ -776,7 +776,7 @@ static int __devinit max17042_probe(struct i2c_client *client,
         return 0;
 }
 
-static int __devexit max17042_remove(struct i2c_client *client)
+static int max17042_remove(struct i2c_client *client)
 {
         struct max17042_chip *chip = i2c_get_clientdata(client);
 
@@ -852,7 +852,7 @@ static struct i2c_driver max17042_i2c_driver = {
                 .pm     = MAX17042_PM_OPS,
         },
         .probe          = max17042_probe,
-        .remove         = __devexit_p(max17042_remove),
+        .remove         = max17042_remove,
         .id_table       = max17042_id,
 };
 module_i2c_driver(max17042_i2c_driver);