summaryrefslogtreecommitdiffstats
path: root/kernel-armv7hl-lpae-fedora.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2021-04-24 07:11:25 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2021-04-24 07:11:25 +0200
commita11025558f451197ba6ab628b171c8b0404b29fa (patch)
treef19b3b932aeb6a9a539aa64511f01bb599a44cce /kernel-armv7hl-lpae-fedora.config
parentec4d166e3c82e11f05003fe10b21754be0ee9fcd (diff)
parentb4915af1bf072e4621bcb9e7ac3a4d84e537b061 (diff)
downloadkernel-a11025558f451197ba6ab628b171c8b0404b29fa.tar.gz
kernel-a11025558f451197ba6ab628b171c8b0404b29fa.tar.xz
kernel-a11025558f451197ba6ab628b171c8b0404b29fa.zip
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc8.20210423git7af08140979a.193.vanilla.1.fc34
Diffstat (limited to 'kernel-armv7hl-lpae-fedora.config')
-rw-r--r--kernel-armv7hl-lpae-fedora.config8
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config
index 2ac4e3275..89d2abb37 100644
--- a/kernel-armv7hl-lpae-fedora.config
+++ b/kernel-armv7hl-lpae-fedora.config
@@ -122,7 +122,7 @@ CONFIG_AD7949=m
# CONFIG_AD799X is not set
# CONFIG_AD8366 is not set
# CONFIG_AD8801 is not set
-CONFIG_AD9467=m
+# CONFIG_AD9467 is not set
# CONFIG_AD9523 is not set
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
@@ -131,7 +131,7 @@ CONFIG_ADAPTEC_STARFIRE=m
# CONFIG_ADF4350 is not set
# CONFIG_ADF4371 is not set
# CONFIG_ADFS_FS is not set
-CONFIG_ADI_AXI_ADC=m
+# CONFIG_ADI_AXI_ADC is not set
CONFIG_ADIN_PHY=m
# CONFIG_ADIS16080 is not set
# CONFIG_ADIS16130 is not set
@@ -6429,7 +6429,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
-CONFIG_SND_INTEL_BYT_PREFER_SOF=y
+# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
CONFIG_SND_ISIGHT=m
# CONFIG_SND_JACK_INJECTION_DEBUG is not set
CONFIG_SND_JACK=y
@@ -6681,7 +6681,6 @@ CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
CONFIG_SND_SOC_SOF_GEMINILAKE=m
# CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1 is not set
CONFIG_SND_SOC_SOF_ICELAKE=m
-# CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK is not set
CONFIG_SND_SOC_SOF_JASPERLAKE=m
CONFIG_SND_SOC_SOF_MERRIFIELD=m
# CONFIG_SND_SOC_SOF_NOCODEC is not set
@@ -8135,7 +8134,6 @@ CONFIG_VIRTIO_CONSOLE=m
CONFIG_VIRTIO_FS=m
CONFIG_VIRTIO_INPUT=m
# CONFIG_VIRTIO_IOMMU is not set
-CONFIG_VIRTIO_MEM=m
CONFIG_VIRTIO_MENU=y
# CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set
CONFIG_VIRTIO_MMIO=m