Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

torvalds · torvalds · commit 0bac038a9eec · 2009-01-17T14:28:23.000-08:00
* '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
diff --git 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;
 

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ static struct regulator_desc regulators[] = {`
`289`	`289`	`},`
`290`	`290`	`};`
`291`	`291`
`292`		`-static int __init wm8400_regulator_probe(struct platform_device *pdev)`
	`292`	`+static int __devinit wm8400_regulator_probe(struct platform_device *pdev)`
`293`	`293`	`{`
`294`	`294`	`struct regulator_dev *rdev;`
`295`	`295`