diff --git a/[refs] b/[refs]
index db1263df750c..c834fe03d62e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab353c2375258fced2967dfe66ff109098797cf1
+refs/heads/master: 1c37f8a838fa8b1e98a984893bd4f1a8a9849421
diff --git a/trunk/drivers/regulator/fixed.c b/trunk/drivers/regulator/fixed.c
index e24e3a174c4b..40f38030b394 100644
--- a/trunk/drivers/regulator/fixed.c
+++ b/trunk/drivers/regulator/fixed.c
@@ -192,7 +192,9 @@ static int __devinit reg_fixed_voltage_probe(struct platform_device *pdev)
 	drvdata->desc.type = REGULATOR_VOLTAGE;
 	drvdata->desc.owner = THIS_MODULE;
 	drvdata->desc.ops = &fixed_voltage_ops;
-	drvdata->desc.n_voltages = 1;
+
+	if (config->microvolts)
+		drvdata->desc.n_voltages = 1;
 
 	drvdata->microvolts = config->microvolts;
 	drvdata->gpio = config->gpio;