diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-06 06:15:34 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-08-06 06:15:34 +0200 |
commit | 1ad050a2fe8600ce55c1c635296588356f8e46c9 (patch) | |
tree | a9bdc68ea0ff4fe0f310d373b812fc3b19854b34 /kernel-i686-debug-fedora.config | |
parent | db2ec89709f8c0db5edc0fcddef64f35d834ad4e (diff) | |
parent | f1d22013a4efa43f188cac6300d3945a423ec49a (diff) | |
download | kernel-1ad050a2fe8600ce55c1c635296588356f8e46c9.tar.gz kernel-1ad050a2fe8600ce55c1c635296588356f8e46c9.tar.xz kernel-1ad050a2fe8600ce55c1c635296588356f8e46c9.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc4.20210805git251a1524293d.37.vanilla.1.fc35kernel-5.14.0-0.rc4.20210805git251a1524293d.37.vanilla.1.fc34kernel-5.14.0-0.rc4.20210805git251a1524293d.37.vanilla.1.fc33
Diffstat (limited to 'kernel-i686-debug-fedora.config')
-rw-r--r-- | kernel-i686-debug-fedora.config | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index db4842fdc..30d10f68f 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -1132,9 +1132,9 @@ CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA3=y CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SIMD=y -CONFIG_CRYPTO_SM2=m -CONFIG_CRYPTO_SM3=m -CONFIG_CRYPTO_SM4=m +# CONFIG_CRYPTO_SM2 is not set +# CONFIG_CRYPTO_SM3 is not set +# CONFIG_CRYPTO_SM4 is not set CONFIG_CRYPTO_STATS=y CONFIG_CRYPTO_STREEBOG=m # CONFIG_CRYPTO_TEA is not set @@ -1165,8 +1165,8 @@ CONFIG_CW1200_WLAN_SDIO=m CONFIG_CW1200_WLAN_SPI=m CONFIG_CXD2880_SPI_DRV=m # CONFIG_CX_ECAT is not set -CONFIG_CXL_ACPI=m -CONFIG_CXL_BUS=m +CONFIG_CXL_ACPI=y +CONFIG_CXL_BUS=y CONFIG_CXL_MEM=m # CONFIG_CXL_MEM_RAW_COMMANDS is not set CONFIG_CXL_PMEM=m @@ -3255,7 +3255,7 @@ CONFIG_LLC=m CONFIG_LMP91000=m CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set -CONFIG_LOCKDEP_BITS=15 +CONFIG_LOCKDEP_BITS=16 CONFIG_LOCKDEP_CHAINS_BITS=16 CONFIG_LOCKDEP_CIRCULAR_QUEUE_BITS=12 CONFIG_LOCKDEP_STACK_TRACE_BITS=19 @@ -3734,7 +3734,7 @@ CONFIG_MOUSE_PS2_SENTELIC=y # CONFIG_MOUSE_PS2_TOUCHKIT is not set CONFIG_MOUSE_PS2_VMMOUSE=y CONFIG_MOUSE_PS2=y -# CONFIG_MOUSE_SERIAL is not set +CONFIG_MOUSE_SERIAL=m CONFIG_MOUSE_SYNAPTICS_I2C=m CONFIG_MOUSE_SYNAPTICS_USB=m # CONFIG_MOUSE_VSXXXAA is not set |