diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-17 10:20:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-07-17 10:20:26 -0700 |
| commit | 8da822e8a573767c4777a4b3f11ee12954a8cd0e (patch) | |
| tree | 4b6baee2847d04a2ffba6ecbe37a3715fc2d8544 /MAINTAINERS | |
| parent | ee43695571c258c0945d4c456ea85b2af9aafdf4 (diff) | |
| parent | 412847fb47336c58885ac6231a5f34ac7ac862a0 (diff) | |
| download | linux-8da822e8a573767c4777a4b3f11ee12954a8cd0e.tar.bz2 | |
Merge tag 'regulator-fix-v5.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into master
Pull regulator fixes from Mark Brown:
"The more substantial fix here is the rename of the da903x driver which
fixes a collision with the parent MFD driver name which caused issues
when things were built as modules.
There's also a fix for a mislableled regulator on the pmi8994 which is
quite important for systems with that device"
* tag 'regulator-fix-v5.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
MAINTAINERS: remove obsolete entry after file renaming
regulator: rename da903x to da903x-regulator
regulator: qcom_smd: Fix pmi8994 label
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b7e5d360091f..d53db30d1365 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5022,7 +5022,6 @@ F: drivers/mfd/da91??-*.c F: drivers/pinctrl/pinctrl-da90??.c F: drivers/power/supply/da9052-battery.c F: drivers/power/supply/da91??-*.c -F: drivers/regulator/da903x.c F: drivers/regulator/da9???-regulator.[ch] F: drivers/regulator/slg51000-regulator.[ch] F: drivers/rtc/rtc-da90??.c |