UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'regulator-4.21' into regulator-5.0

This commit is contained in:
Mark Brown 2019-01-07 12:42:19 +00:00
parent bfeffd1552 4cac31e2be
commit 526d02dd37
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/regulator/lochnagar-regulator.c
View File

@ -226,7 +226,7 @@ static const struct of_device_id lochnagar_of_match[] = {
}, },
{ {
.compatible = "cirrus,lochnagar2-mic2vdd", .compatible = "cirrus,lochnagar2-mic2vdd",
.data = &lochnagar_regulators[LOCHNAGAR_MIC1VDD], .data = &lochnagar_regulators[LOCHNAGAR_MIC2VDD],
}, },
{ {
.compatible = "cirrus,lochnagar2-vddcore", .compatible = "cirrus,lochnagar2-vddcore",