diff --git a/[refs] b/[refs] index 3212a4a7a9fb..83f949fa5341 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5838b032fd69ae47565ddc50062decf9055e1628 +refs/heads/master: 9345dfb8495aa17ce7c575e1a96e5ad64def0b3d diff --git a/trunk/drivers/regulator/core.c b/trunk/drivers/regulator/core.c index da9782bd27d0..154bc8f0c1a0 100644 --- a/trunk/drivers/regulator/core.c +++ b/trunk/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