Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next
Mark Brown [Sat, 12 May 2012 10:10:25 +0000 (11:10 +0100)]
Conflicts:
drivers/regulator/88pm8607.c (simple overlap with a bugfix in v3.4)

1  2 
drivers/regulator/da9052-regulator.c
drivers/regulator/rc5t583-regulator.c
drivers/regulator/tps65023-regulator.c
drivers/regulator/tps65090-regulator.c
drivers/regulator/tps65910-regulator.c
drivers/regulator/wm831x-dcdc.c
drivers/regulator/wm831x-ldo.c
drivers/regulator/wm8994-regulator.c
include/linux/i2c/twl.h

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -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)) {
Simple merge