| commit | a6117615a21323140e67d394a3301fd319468f1c | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Thu Oct 24 11:11:36 2013 +0100 |
| committer | Mark Brown <broonie@linaro.org> | Thu Oct 24 11:11:36 2013 +0100 |
| tree | a22bb5b68d6da3943e1aa6fede852da665c29b4a | |
| parent | 706664c290d69f890a9e3acfc6a8196098459826 [diff] | |
| parent | 6653efb75dcac8fc61191cba9bd6dda99137bc44 [diff] |
Merge remote-tracking branch 'regulator/topic/gpio' into regulator-next
diff --git a/drivers/regulator/gpio-regulator.c b/drivers/regulator/gpio-regulator.c index 98a98ff..04406a9 100644 --- a/drivers/regulator/gpio-regulator.c +++ b/drivers/regulator/gpio-regulator.c
@@ -283,7 +283,6 @@ dev_err(&pdev->dev, "No regulator type set\n"); ret = -EINVAL; goto err_memgpio; - break; } drvdata->nr_gpios = config->nr_gpios;