summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-17 14:28:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-17 14:28:23 -0800
commit0bac038a9eec00ac27f95ca0360954c0016fd859 (patch)
tree3c300d84e1a1ccaddf67942380e7d95208d4adb1
parent81156928f8fe31621e467490b9d441c0285998c3 (diff)
parent5dbdf7354821e00e4419ac3520d05d126857d56e (diff)
downloadlinux-3.10-0bac038a9eec00ac27f95ca0360954c0016fd859.tar.gz
linux-3.10-0bac038a9eec00ac27f95ca0360954c0016fd859.tar.bz2
linux-3.10-0bac038a9eec00ac27f95ca0360954c0016fd859.zip
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: move wm8400-regulator's probe function to .devinit.text
-rw-r--r--drivers/regulator/wm8400-regulator.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/wm8400-regulator.c b/drivers/regulator/wm8400-regulator.c
index 48b372e038a..56e23d44ba5 100644
--- a/drivers/regulator/wm8400-regulator.c
+++ b/drivers/regulator/wm8400-regulator.c
@@ -289,7 +289,7 @@ static struct regulator_desc regulators[] = {
},
};
-static int __init wm8400_regulator_probe(struct platform_device *pdev)
+static int __devinit wm8400_regulator_probe(struct platform_device *pdev)
{
struct regulator_dev *rdev;