diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-05 13:36:10 +0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-05 13:36:10 +0400 |
commit | 0ac682db5c18358d6b3606cab6147dc294c4286d (patch) | |
tree | 665b66c958cb151546ca1475684ec0848b14744b /drivers/regulator/core.c | |
parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) | |
parent | 9345dfb8495aa17ce7c575e1a96e5ad64def0b3d (diff) | |
download | linux-0ac682db5c18358d6b3606cab6147dc294c4286d.tar.xz |
Merge remote-tracking branch 'regulator/fix/doc' into regulator-enable-invert
Diffstat (limited to 'drivers/regulator/core.c')
-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 da9782bd27d0..154bc8f0c1a0 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 |