Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[~andy/linux] / drivers / power / max8997_charger.c

diff --git a/drivers/power/max8997_charger.c b/drivers/power/max8997_charger.c
index c6767dfd4c41c12d6b0bab72594e4c48e0f733a8..e757885b620c5c6cf00639fc6a5952631308041b 100644 (file)
--- a/drivers/power/max8997_charger.c
+++ b/drivers/power/max8997_charger.c
@@ -167,7 +167,7 @@ err:
        return ret;
 }
 
-static int __devexit max8997_battery_remove(struct platform_device *pdev)
+static int max8997_battery_remove(struct platform_device *pdev)
 {
        struct charger_data *charger = platform_get_drvdata(pdev);