summaryrefslogtreecommitdiffstats
path: root/kernel-s390x-zfcpdump-rhel.config
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-05-29 19:50:14 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-05-29 19:50:14 +0200
commit59adb3dc6384af48c3b97589c8d887c87689e0e4 (patch)
treec0fb7c5ecc5260b57173619973336989e0b8a256 /kernel-s390x-zfcpdump-rhel.config
parentd48a756e71e269ecef24682ba38b6b49ed2a6abe (diff)
parent42bbfcc428758569177d4e644fddfb5ed46c57a5 (diff)
downloadkernel-59adb3dc6384af48c3b97589c8d887c87689e0e4.tar.gz
kernel-59adb3dc6384af48c3b97589c8d887c87689e0e4.tar.xz
kernel-59adb3dc6384af48c3b97589c8d887c87689e0e4.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc7.20200529gitb0c3ba31be3e.1.vanilla.1.fc32
Diffstat (limited to 'kernel-s390x-zfcpdump-rhel.config')
-rw-r--r--kernel-s390x-zfcpdump-rhel.config5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config
index 561ded5bf..9eae33db5 100644
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@@ -2539,7 +2539,7 @@ CONFIG_LSM="yama,integrity,selinux"
# CONFIG_LTE_GDM724X is not set
# CONFIG_LTR501 is not set
# CONFIG_LV0104CS is not set
-# CONFIG_LWTUNNEL_BPF is not set
+CONFIG_LWTUNNEL_BPF=y
CONFIG_LWTUNNEL=y
# CONFIG_LXT_PHY is not set
# CONFIG_M62332 is not set
@@ -4819,7 +4819,7 @@ CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
-# CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH is not set
+CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
# CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES is not set
# CONFIG_SND_SOC is not set
@@ -4848,6 +4848,7 @@ CONFIG_SND_SOC_MAX98373=m
# CONFIG_SND_SOC_PCM3060_SPI is not set
# CONFIG_SND_SOC_PCM3168A_I2C is not set
# CONFIG_SND_SOC_PCM3168A_SPI is not set
+# CONFIG_SND_SOC_PCM512x_I2C is not set
# CONFIG_SND_SOC_RK3328 is not set
# CONFIG_SND_SOC_RT5616 is not set
# CONFIG_SND_SOC_RT5631 is not set