diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-07-31 09:59:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-31 09:59:28 +0200 |
| commit | acd632eb64b6cd8e25583bb248c36aa937b8f021 (patch) | |
| tree | 993d276cbadb450fe8cf5e3c66d444a905d452e7 /drivers/regulator/max8973-regulator.c | |
| parent | 4b0c53e9e1a2a785746b2d379a32cb70b4dbb2fd (diff) | |
| parent | 5542b2aa9eea3f2bb922029c8cc4b4346c4f6b1c (diff) | |
| download | talos-obmc-linux-acd632eb64b6cd8e25583bb248c36aa937b8f021.tar.gz talos-obmc-linux-acd632eb64b6cd8e25583bb248c36aa937b8f021.zip | |
Merge branch 'perf/urgent' into perf/core, to merge fixes before pulling more changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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; } |
