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

…next
git-mirror · Feb 19, 2013 · 7280888 · 7280888
2 parents cf1466f + f33d008
commit 7280888
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c
@@ -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)