summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-05-19 11:31:24 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-05-19 11:31:24 -0700
commit467999f50ce63197b56fa4eab72e0a8f395388ed (patch)
treecb1ffed83309b3231067603d57c4fd36efed85be
parent26a9a418237c0b06528941bca693c49c8d97edbe (diff)
parent5b4662f098b47f68d7fcea9b065d1513547fef12 (diff)
downloadop-kernel-dev-467999f50ce63197b56fa4eab72e0a8f395388ed.zip
op-kernel-dev-467999f50ce63197b56fa4eab72e0a8f395388ed.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6: regulator: da903x: add missing __devexit_p()
-rw-r--r--drivers/regulator/da903x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c
index 72b1549..c6628f5 100644
--- a/drivers/regulator/da903x.c
+++ b/drivers/regulator/da903x.c
@@ -497,7 +497,7 @@ static struct platform_driver da903x_regulator_driver = {
.owner = THIS_MODULE,
},
.probe = da903x_regulator_probe,
- .remove = da903x_regulator_remove,
+ .remove = __devexit_p(da903x_regulator_remove),
};
static int __init da903x_regulator_init(void)
OpenPOWER on IntegriCloud