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

This commit is contained in:
Mark Brown
2013-09-01 13:50:13 +01:00

View File

@@ -907,7 +907,8 @@ static struct lp872x_platform_data
goto out; goto out;
for (i = 0; i < num_matches; i++) { for (i = 0; i < num_matches; i++) {
pdata->regulator_data[i].id = (int)match[i].driver_data; pdata->regulator_data[i].id =
(enum lp872x_regulator_id)match[i].driver_data;
pdata->regulator_data[i].init_data = match[i].init_data; pdata->regulator_data[i].init_data = match[i].init_data;
/* Operation mode configuration for buck/buck1/buck2 */ /* Operation mode configuration for buck/buck1/buck2 */