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

72808887 · Mark Brown · cf1466fb · f33d0081 · 72808887
Commit 72808887 authored Feb 19, 2013 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

drivers/regulator/palmas-regulator.c drivers/regulator/palmas-regulator.c +0 -5

No files found.
--- 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)