diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-08-30 17:43:49 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-08-30 17:43:49 +0200 |
commit | 4c0beed94d7571d50ebc24c7eb64d2caf7878f51 (patch) | |
tree | 1219f73abfc9fe96a9c24effc287b93fa00bc242 /kernel-x86_64-fedora.config | |
parent | 68aba11e5d289f1a5d571d1ea7c97727f8bb0aac (diff) | |
parent | aff6e8acdaa437e9f06ef4166ca2209071223f8d (diff) | |
download | kernel-4c0beed94d7571d50ebc24c7eb64d2caf7878f51.tar.gz kernel-4c0beed94d7571d50ebc24c7eb64d2caf7878f51.tar.xz kernel-4c0beed94d7571d50ebc24c7eb64d2caf7878f51.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-6.0.0-0.rc3.20220830gitdcf8e5633e2e.26.vanilla.1.fc36
Diffstat (limited to 'kernel-x86_64-fedora.config')
-rw-r--r-- | kernel-x86_64-fedora.config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index ffd52d037..9b52a5ba4 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -3453,6 +3453,7 @@ CONFIG_MAGIC_SYSRQ=y CONFIG_MAILBOX=y # CONFIG_MANAGER_SBS is not set CONFIG_MANTIS_CORE=m +# CONFIG_MARCH_Z16 is not set CONFIG_MARVELL_10G_PHY=m CONFIG_MARVELL_88X2222_PHY=m # CONFIG_MARVELL_CN10K_TAD_PMU is not set |