diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-18 04:40:59 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-02-18 04:40:59 +0100 |
commit | a69ff84e6eb036e0f274cbb14c5b71546e4af21e (patch) | |
tree | cb23a9e1e8922fa544d544bbf708ae53fd4685e5 /kernel-i686-fedora.config | |
parent | aed4b39bbc1b324564fab1dbf58b5b9d501d4a0f (diff) | |
parent | b30e1518d13b169ed5d359d585387f755ee3ea2f (diff) | |
download | kernel-a69ff84e6eb036e0f274cbb14c5b71546e4af21e.tar.gz kernel-a69ff84e6eb036e0f274cbb14c5b71546e4af21e.tar.xz kernel-a69ff84e6eb036e0f274cbb14c5b71546e4af21e.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel-i686-fedora.config')
-rw-r--r-- | kernel-i686-fedora.config | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 4152397e5..14176ec04 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -4425,7 +4425,6 @@ CONFIG_PWRSEQ_SIMPLE=m # CONFIG_QCOM_EMAC is not set # CONFIG_QCOM_HIDMA is not set # CONFIG_QCOM_HIDMA_MGMT is not set -# CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set # CONFIG_QCS_TURING_404 is not set CONFIG_QEDE=m CONFIG_QEDF=m @@ -5667,7 +5666,6 @@ CONFIG_SOUND=m CONFIG_SOUND_OSS_CORE_PRECLAIM=y CONFIG_SOUNDWIRE_CADENCE=m CONFIG_SOUNDWIRE_INTEL=m -# CONFIG_SOUNDWIRE_QCOM is not set CONFIG_SOUNDWIRE=y CONFIG_SP5100_TCO=m CONFIG_SPARSE_IRQ=y |