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

This commit is contained in:
Mark Brown
2013-09-01 13:50:16 +01:00
40 changed files with 188 additions and 53 deletions

View File

@@ -962,7 +962,7 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
}
lp->dev = &cl->dev;
lp->pdata = cl->dev.platform_data;
lp->pdata = dev_get_platdata(&cl->dev);
lp->chipid = id->driver_data;
lp->num_regulators = num_regulators;
i2c_set_clientdata(cl, lp);