diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-05 06:12:39 +0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-05 06:12:39 +0400 |
commit | 6d62768468d5ff96b3977a04045dd80d6710be5d (patch) | |
tree | f2429b5502c9f76650189939c824a95d2544e654 /drivers/regulator | |
parent | 521e2e03b8f6c92910b72fd464126596242398f8 (diff) | |
parent | 9345dfb8495aa17ce7c575e1a96e5ad64def0b3d (diff) | |
download | linux-6d62768468d5ff96b3977a04045dd80d6710be5d.tar.xz |
Merge remote-tracking branch 'regulator/fix/doc' into tmp
Diffstat (limited to 'drivers/regulator')
-rw-r--r-- | drivers/regulator/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 4a7790c58257..e3661c20cf38 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -2830,7 +2830,7 @@ EXPORT_SYMBOL_GPL(regulator_get_bypass_regmap); * regulator_allow_bypass - allow the regulator to go into bypass mode * * @regulator: Regulator to configure - * @allow: enable or disable bypass mode + * @enable: enable or disable bypass mode * * Allow the regulator to go into bypass mode if all other consumers * for the regulator also enable bypass mode and the machine |