diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-17 18:21:30 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-17 18:21:30 +0200 |
commit | 9d8cc94b05933f016a226898842277611bafd566 (patch) | |
tree | 44bd1fc40427c8d932bb2d5bcac9f86b3b1feedc /kernel-ppc64le-debug-rhel.config | |
parent | 6243c80866b326be88265a9756403a577110d2d9 (diff) | |
parent | fa13b59d638eb5dd773694de898e8f99d1d85526 (diff) | |
download | kernel-9d8cc94b05933f016a226898842277611bafd566.tar.gz kernel-9d8cc94b05933f016a226898842277611bafd566.tar.xz kernel-9d8cc94b05933f016a226898842277611bafd566.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.9.0-0.rc1.1.vanilla.1.fc34kernel-5.9.0-0.rc1.1.vanilla.1.fc33kernel-5.9.0-0.rc1.1.vanilla.1.fc32kernel-5.9.0-0.rc1.1.vanilla.1.fc31
Diffstat (limited to 'kernel-ppc64le-debug-rhel.config')
-rw-r--r-- | kernel-ppc64le-debug-rhel.config | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index b63fae967..8a76973c4 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -192,7 +192,6 @@ CONFIG_ARM64_ERRATUM_1319367=y CONFIG_ARM64_ERRATUM_1530923=y CONFIG_ARM64_ERRATUM_1542419=y CONFIG_ARM64_USE_LSE_ATOMICS=y -CONFIG_ARM_SMCCC_SOC_ID=y # CONFIG_ARM_SMC_WATCHDOG is not set # CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set # CONFIG_AS3935 is not set @@ -4075,7 +4074,7 @@ CONFIG_RDMA_RXE=m CONFIG_RDMA_SIW=m # CONFIG_RDS is not set CONFIG_RD_XZ=y -CONFIG_RD_ZSTD=y +# CONFIG_RD_ZSTD is not set # CONFIG_READABLE_ASM is not set # CONFIG_READ_ONLY_THP_FOR_FS is not set CONFIG_REALTEK_AUTOPM=y @@ -4846,7 +4845,7 @@ CONFIG_SND_HDA_HWDEP=y CONFIG_SND_HDA_INPUT_BEEP_MODE=0 CONFIG_SND_HDA_INPUT_BEEP=y # CONFIG_SND_HDA_INTEL_HDMI_SILENT_STREAM is not set -# CONFIG_SND_HDA_INTEL is not set +CONFIG_SND_HDA_INTEL=m CONFIG_SND_HDA_PATCH_LOADER=y CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0 CONFIG_SND_HDA_PREALLOC_SIZE=512 |