Merge remote-tracking branch 'regulator/topic/tps516312' into regulator-next

[deliverable/linux.git] / drivers / regulator / twl-regulator.c

diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 66e62a2cb244bb158c6413d9890f045ae9e9d2c8..493c8c6a241f41b1820786b993b342816002bc1c 100644 (file)
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -1241,7 +1241,7 @@ static int twlreg_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int __devexit twlreg_remove(struct platform_device *pdev)
+static int twlreg_remove(struct platform_device *pdev)
 {
        struct regulator_dev *rdev = platform_get_drvdata(pdev);
        struct twlreg_info *info = rdev->reg_data;