Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / power / charger-manager.c

diff --git a/drivers/power/charger-manager.c b/drivers/power/charger-manager.c
index 8a0aca6364c7e8ba9ab68261b598afe2e155ad18..adb3a4b59cb3a369b569dc235eddfbd8e07dc0bc 100644 (file)
--- a/drivers/power/charger-manager.c
+++ b/drivers/power/charger-manager.c
@@ -1655,7 +1655,7 @@ err_alloc:
        return ret;
 }
 
-static int __devexit charger_manager_remove(struct platform_device *pdev)
+static int charger_manager_remove(struct platform_device *pdev)
 {
        struct charger_manager *cm = platform_get_drvdata(pdev);
        struct charger_desc *desc = cm->desc;
@@ -1812,7 +1812,7 @@ static struct platform_driver charger_manager_driver = {
                .pm = &charger_manager_pm,
        },
        .probe = charger_manager_probe,
-       .remove = __devexit_p(charger_manager_remove),
+       .remove = charger_manager_remove,
        .id_table = charger_manager_id,
 };