summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-05 10:12:37 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-03-05 10:12:37 +0800
commit521e2e03b8f6c92910b72fd464126596242398f8 (patch)
tree118001e12d62170e1edbe50dc1d621da3419d84f /drivers/regulator
parent5fb910d39133cc28ec25d4b2eea26b48f3ab4ef1 (diff)
parent4ceb73ae5a09416e040bce8bcfa7218dc5149ad8 (diff)
downloadlinux-3.10-521e2e03b8f6c92910b72fd464126596242398f8.tar.gz
linux-3.10-521e2e03b8f6c92910b72fd464126596242398f8.tar.bz2
linux-3.10-521e2e03b8f6c92910b72fd464126596242398f8.zip
Merge remote-tracking branch 'regulator/fix/db8500' into tmp
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/db8500-prcmu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/regulator/db8500-prcmu.c b/drivers/regulator/db8500-prcmu.c
index 219d162b651..a53c11a529d 100644
--- a/drivers/regulator/db8500-prcmu.c
+++ b/drivers/regulator/db8500-prcmu.c
@@ -528,7 +528,7 @@ static int db8500_regulator_probe(struct platform_device *pdev)
return 0;
}
-static int __exit db8500_regulator_remove(struct platform_device *pdev)
+static int db8500_regulator_remove(struct platform_device *pdev)
{
int i;
@@ -553,7 +553,7 @@ static struct platform_driver db8500_regulator_driver = {
.owner = THIS_MODULE,
},
.probe = db8500_regulator_probe,
- .remove = __exit_p(db8500_regulator_remove),
+ .remove = db8500_regulator_remove,
};
static int __init db8500_regulator_init(void)