diff options
| author | Mark Brown <broonie@kernel.org> | 2019-01-07 12:42:19 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-01-07 12:42:19 +0000 |
| commit | 526d02dd37b9875ed7fc43ee741cdb2e19544c5d (patch) | |
| tree | 5d1eb9287e96c2405e55528ae3466176c68c39b2 /drivers/regulator | |
| parent | bfeffd155283772bbe78c6a05dec7c0128ee500c (diff) | |
| parent | 4cac31e2be6e569bd55f936e662d2d146325b74c (diff) | |
| download | linux-stable-526d02dd37b9875ed7fc43ee741cdb2e19544c5d.tar.gz linux-stable-526d02dd37b9875ed7fc43ee741cdb2e19544c5d.tar.bz2 linux-stable-526d02dd37b9875ed7fc43ee741cdb2e19544c5d.zip | |
Merge branch 'regulator-4.21' into regulator-5.0
Diffstat (limited to 'drivers/regulator')
| -rw-r--r-- | drivers/regulator/lochnagar-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/lochnagar-regulator.c b/drivers/regulator/lochnagar-regulator.c index 5a89e6d4b9a6..818d20410518 100644 --- a/drivers/regulator/lochnagar-regulator.c +++ b/drivers/regulator/lochnagar-regulator.c @@ -226,7 +226,7 @@ static const struct of_device_id lochnagar_of_match[] = { }, { .compatible = "cirrus,lochnagar2-mic2vdd", - .data = &lochnagar_regulators[LOCHNAGAR_MIC1VDD], + .data = &lochnagar_regulators[LOCHNAGAR_MIC2VDD], }, { .compatible = "cirrus,lochnagar2-vddcore", |