diff options
author | Mark Brown <broonie@kernel.org> | 2015-09-04 19:16:39 +0300 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-09-04 19:16:39 +0300 |
commit | 04782ca20a8ebb5acf0c35756a38964ae5ea7321 (patch) | |
tree | ebf475793bb17444d3a1e21974617f27e8ff3a4b /drivers/regulator/max8973-regulator.c | |
parent | d5b98eb12420ce856caaf57dc5256eedc56a3747 (diff) | |
parent | 17649c90ff4c5246bb4babf6260029968a6d119d (diff) | |
download | linux-04782ca20a8ebb5acf0c35756a38964ae5ea7321.tar.xz |
Merge branch 'topic/smbus-block' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-core
Diffstat (limited to 'drivers/regulator/max8973-regulator.c')
-rw-r--r-- | drivers/regulator/max8973-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c index 6f2bdad8b4d8..e94ddcf97722 100644 --- a/drivers/regulator/max8973-regulator.c +++ b/drivers/regulator/max8973-regulator.c @@ -450,7 +450,7 @@ static struct max8973_regulator_platform_data *max8973_parse_dt( pdata->control_flags |= MAX8973_CONTROL_FREQ_SHIFT_9PER_ENABLE; if (of_property_read_bool(np, "maxim,enable-bias-control")) - pdata->control_flags |= MAX8973_BIAS_ENABLE; + pdata->control_flags |= MAX8973_CONTROL_BIAS_ENABLE; return pdata; } |