diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-10 19:19:59 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-12-10 19:19:59 +0100 |
commit | 8ce5292cca7e27faa272974c2ccd6edb5c352301 (patch) | |
tree | f0719f86c203fa4ee62d8790cc63579c5dfcc424 /kernel-armv7hl-fedora.config | |
parent | 1c4fc42e6c7d1369d56373ae22373cd389af4ca2 (diff) | |
parent | 3cdb1db179700bb87f57c3b545772d31485c5923 (diff) | |
download | kernel-8ce5292cca7e27faa272974c2ccd6edb5c352301.tar.gz kernel-8ce5292cca7e27faa272974c2ccd6edb5c352301.tar.xz kernel-8ce5292cca7e27faa272974c2ccd6edb5c352301.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.5.0-0.rc1.git1.1.vanilla.knurd.1.fc31
Diffstat (limited to 'kernel-armv7hl-fedora.config')
-rw-r--r-- | kernel-armv7hl-fedora.config | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 6ac7b14d5..76ce11adf 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -474,7 +474,7 @@ CONFIG_AUTOFS_FS=y CONFIG_AUTO_ZRELADDR=y CONFIG_AUXDISPLAY=y CONFIG_AX25_DAMA_SLAVE=y -# CONFIG_AX25 is not set +CONFIG_AX25=m CONFIG_AX88796_93CX6=y CONFIG_AX88796B_PHY=m CONFIG_AX88796=m @@ -4909,6 +4909,7 @@ CONFIG_QCOM_HFPLL=m # CONFIG_QCOM_HIDMA_MGMT is not set CONFIG_QCOM_IOMMU=y # CONFIG_QCOM_LLCC is not set +CONFIG_QCOM_OCMEM=m CONFIG_QCOM_PDC=y CONFIG_QCOM_PM8XXX_XOADC=m CONFIG_QCOM_PM=y |