summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/anatop-regulator.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-25 10:11:40 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-06-25 10:11:40 +0100
commit85e63343f49cdf859bb630ba39d9a9af85dfb3e6 (patch)
tree8c72184c38d93a34e08f386ae70b4ee12ed7ac20 /drivers/regulator/anatop-regulator.c
parent2f6ae6ef631cd16b0725958ee805a24b9e38d7ad (diff)
parent6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff)
downloadlinux-85e63343f49cdf859bb630ba39d9a9af85dfb3e6.tar.gz
linux-85e63343f49cdf859bb630ba39d9a9af85dfb3e6.tar.bz2
linux-85e63343f49cdf859bb630ba39d9a9af85dfb3e6.zip
Merge tag 'v3.5-rc4' into regulator-drivers
Linux 3.5-rc4 contains patches which conflict with some of the development work.
Diffstat (limited to 'drivers/regulator/anatop-regulator.c')
-rw-r--r--drivers/regulator/anatop-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/anatop-regulator.c b/drivers/regulator/anatop-regulator.c
index 4324cea01141..e9c2085f9dfb 100644
--- a/drivers/regulator/anatop-regulator.c
+++ b/drivers/regulator/anatop-regulator.c
@@ -198,7 +198,7 @@ static struct platform_driver anatop_regulator_driver = {
.of_match_table = of_anatop_regulator_match_tbl,
},
.probe = anatop_regulator_probe,
- .remove = anatop_regulator_remove,
+ .remove = __devexit_p(anatop_regulator_remove),
};
static int __init anatop_regulator_init(void)