From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Sat, 12 May 2012 10:10:25 +0000 (+0100)
Subject: Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5949a7e9ab2db04edaeee7c368eb4c99131f4629;p=linux-beck.git

Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next

Conflicts:
	drivers/regulator/88pm8607.c (simple overlap with a bugfix in v3.4)
---

5949a7e9ab2db04edaeee7c368eb4c99131f4629
diff --cc drivers/regulator/wm8994-regulator.c
index e07972fbf44f,f2912f1528cc..7c64ce599d2a
--- a/drivers/regulator/wm8994-regulator.c
+++ b/drivers/regulator/wm8994-regulator.c
@@@ -191,17 -233,9 +191,10 @@@ static __devinit int wm8994_ldo_probe(s
  	} else
  		ldo->is_enabled = true;
  
- 	config.dev = &pdev->dev;
+ 	config.dev = wm8994->dev;
  	config.init_data = pdata->ldo[id].init_data;
  	config.driver_data = ldo;
 +	config.regmap = wm8994->regmap;
  
  	ldo->regulator = regulator_register(&wm8994_ldo_desc[id], &config);
  	if (IS_ERR(ldo->regulator)) {