diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-13 20:00:38 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-04-13 20:00:38 +0200 |
| commit | b752298355854041051b59db67c5e9d5c2e25ce2 (patch) | |
| tree | caf9a2f4b1a8b79053ca71e21d4b1579abfd4a02 /kernel-armv7hl.config | |
| parent | 9197b3f4350f8707d905acb031bf68d3532cdebc (diff) | |
| parent | a242ace4292cab0b80878551cbe385a0dbd30548 (diff) | |
| download | kernel-b752298355854041051b59db67c5e9d5c2e25ce2.tar.gz kernel-b752298355854041051b59db67c5e9d5c2e25ce2.tar.xz kernel-b752298355854041051b59db67c5e9d5c2e25ce2.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.17.0-0.rc0.git9.1.vanilla.knurd.1.fc29kernel-4.17.0-0.rc0.git9.1.vanilla.knurd.1.fc28kernel-4.17.0-0.rc0.git9.1.vanilla.knurd.1.fc27kernel-4.17.0-0.rc0.git9.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel-armv7hl.config')
| -rw-r--r-- | kernel-armv7hl.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index e79bc3e44..e0428c8b9 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -882,7 +882,7 @@ CONFIG_CHARGER_QCOM_SMBB=m # CONFIG_CHARGER_SBS is not set CONFIG_CHARGER_SMB347=m CONFIG_CHARGER_TPS65090=m -CONFIG_CHARGER_TPS65217=m +# CONFIG_CHARGER_TPS65217 is not set CONFIG_CHARGER_TWL4030=m # CONFIG_CHASH_SELFTEST is not set # CONFIG_CHASH_STATS is not set @@ -3312,7 +3312,7 @@ CONFIG_MFD_TI_LMU=m # CONFIG_MFD_TIMBERDALE is not set # CONFIG_MFD_TPS65086 is not set CONFIG_MFD_TPS65090=y -CONFIG_MFD_TPS65217=y +# CONFIG_MFD_TPS65217 is not set CONFIG_MFD_TPS65218=m CONFIG_MFD_TPS6586X=y CONFIG_MFD_TPS65910=y |