diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-18 08:08:53 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-18 08:08:53 +0100 |
commit | 786533b774f9fd841820bddf927651d49b8a7ac7 (patch) | |
tree | 828733aadfd6cd7cea0a90d50f41c72e5f3785a5 /kernel-ppc64le-rhel.config | |
parent | 0e66cf1520c65ef3f026ed1354051187f1600c32 (diff) | |
parent | c88f80dbedca3af02e3b0924e3e8a435b3167346 (diff) | |
download | kernel-786533b774f9fd841820bddf927651d49b8a7ac7.tar.gz kernel-786533b774f9fd841820bddf927651d49b8a7ac7.tar.xz kernel-786533b774f9fd841820bddf927651d49b8a7ac7.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc4.129.vanilla.1.fc34kernel-5.11.0-0.rc4.129.vanilla.1.fc33kernel-5.11.0-0.rc4.129.vanilla.1.fc32
Diffstat (limited to 'kernel-ppc64le-rhel.config')
-rw-r--r-- | kernel-ppc64le-rhel.config | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 6e66af0ec..85bfe56ba 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -162,7 +162,7 @@ CONFIG_ALX=m # CONFIG_AMD8111_ETH is not set # CONFIG_AMD_IOMMU_DEBUGFS is not set CONFIG_AMD_PHY=m -# CONFIG_AMD_PMC is not set +CONFIG_AMD_PMC=m # CONFIG_AMD_SFH_HID is not set # CONFIG_AMDTEE is not set # CONFIG_AMIGA_PARTITION is not set @@ -1025,7 +1025,7 @@ CONFIG_DEFAULT_NET_SCH="fq_codel" CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SFQ is not set # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set -# CONFIG_DELL_WMI_SYSMAN is not set +CONFIG_DELL_WMI_SYSMAN=m CONFIG_DETECT_HUNG_TASK=y CONFIG_DEV_DAX_HMEM=m CONFIG_DEV_DAX_KMEM=m @@ -5018,8 +5018,6 @@ CONFIG_SND_SEQUENCER_OSS=m # CONFIG_SND_SOC_ALC5623 is not set # CONFIG_SND_SOC_AMD_ACP3x is not set # CONFIG_SND_SOC_AMD_ACP is not set -CONFIG_SND_SOC_AMD_RENOIR=m -# CONFIG_SND_SOC_AMD_RENOIR_MACH is not set # CONFIG_SND_SOC_BD28623 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set |