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

This commit is contained in:
Mark Brown 2013-02-19 12:43:07 +00:00
commit 728088871c

View File

@ -567,11 +567,6 @@ static void palmas_dt_to_pdata(struct device *dev,
if (!ret)
pdata->reg_init[idx]->mode_sleep = prop;
ret = of_property_read_u32(palmas_matches[idx].of_node,
"ti,warm_reset", &prop);
if (!ret)
pdata->reg_init[idx]->warm_reset = prop;
ret = of_property_read_u32(palmas_matches[idx].of_node,
"ti,tstep", &prop);
if (!ret)