summaryrefslogtreecommitdiffstats
path: root/kernel-armv7hl-lpae-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-12-10 19:19:59 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2019-12-10 19:19:59 +0100
commit8ce5292cca7e27faa272974c2ccd6edb5c352301 (patch)
treef0719f86c203fa4ee62d8790cc63579c5dfcc424 /kernel-armv7hl-lpae-fedora.config
parent1c4fc42e6c7d1369d56373ae22373cd389af4ca2 (diff)
parent3cdb1db179700bb87f57c3b545772d31485c5923 (diff)
downloadkernel-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-lpae-fedora.config')
-rw-r--r--kernel-armv7hl-lpae-fedora.config3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 526ea28a4..884d35185 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -461,7 +461,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
@@ -4717,6 +4717,7 @@ CONFIG_QCOM_HFPLL=m
# CONFIG_QCOM_HIDMA is not set
# CONFIG_QCOM_HIDMA_MGMT is not set
# CONFIG_QCOM_LLCC is not set
+CONFIG_QCOM_OCMEM=m
CONFIG_QCOM_PDC=y
CONFIG_QCOM_PM8XXX_XOADC=m
CONFIG_QCOM_RMTFS_MEM=m