Browse Source

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

Mark Brown 12 years ago
parent
commit
728088871c
1 changed files with 0 additions and 5 deletions
  1. 0 5
      drivers/regulator/palmas-regulator.c

+ 0 - 5
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)