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/lp8788-charger.c b/drivers/power/lp8788-charger.c
index fb592bfbec6e..22b6407c9ca9 100644
--- a/drivers/power/lp8788-charger.c
+++ b/drivers/power/lp8788-charger.c
@@ -686,7 +686,7 @@ static const struct attribute_group lp8788_attr_group = {
         .attrs = lp8788_charger_attr,
 };
 
-static __devinit int lp8788_charger_probe(struct platform_device *pdev)
+static int lp8788_charger_probe(struct platform_device *pdev)
 {
         struct lp8788 *lp = dev_get_drvdata(pdev->dev.parent);
         struct lp8788_charger *pchg;
@@ -723,7 +723,7 @@ static __devinit int lp8788_charger_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int __devexit lp8788_charger_remove(struct platform_device *pdev)
+static int lp8788_charger_remove(struct platform_device *pdev)
 {
         struct lp8788_charger *pchg = platform_get_drvdata(pdev);
 
@@ -738,7 +738,7 @@ static int __devexit lp8788_charger_remove(struct platform_device *pdev)
 
 static struct platform_driver lp8788_charger_driver = {
         .probe = lp8788_charger_probe,
-        .remove = __devexit_p(lp8788_charger_remove),
+        .remove = lp8788_charger_remove,
         .driver = {
                 .name = LP8788_DEV_CHARGER,
                 .owner = THIS_MODULE,