diff --git a/[refs] b/[refs]
index a25732f59311..a78e6ecc3789 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 328a5369664d09e9082a8e814a9b2dcdfb7f519b
+refs/heads/master: 5689e830745b39dbab895e5e8df3f962cb7eecac
diff --git a/trunk/drivers/regulator/ab8500.c b/trunk/drivers/regulator/ab8500.c
index a2d19c650f24..12e274039ae1 100644
--- a/trunk/drivers/regulator/ab8500.c
+++ b/trunk/drivers/regulator/ab8500.c
@@ -363,8 +363,7 @@ static struct regulator_ops ab8500_regulator_mode_ops = {
 	.set_mode		= ab8500_regulator_set_mode,
 	.get_mode		= ab8500_regulator_get_mode,
 	.get_voltage_sel 	= ab8500_regulator_get_voltage_sel,
-	.list_voltage		= regulator_list_voltage_table,
-	.set_voltage_time_sel	= ab8500_regulator_set_voltage_time_sel,
+	.list_voltage		= regulator_list_voltage_linear,
 };
 
 static struct regulator_ops ab8500_regulator_ops = {
@@ -372,7 +371,7 @@ static struct regulator_ops ab8500_regulator_ops = {
 	.disable		= ab8500_regulator_disable,
 	.is_enabled		= ab8500_regulator_is_enabled,
 	.get_voltage_sel 	= ab8500_regulator_get_voltage_sel,
-	.list_voltage		= regulator_list_voltage_table,
+	.list_voltage		= regulator_list_voltage_linear,
 };
 
 static struct ab8500_regulator_info