diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-14 06:58:26 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-14 06:58:26 +0200 |
| commit | 7fab7d503cf3c9388db6779c203de2670789da4a (patch) | |
| tree | b8eb9fe3f00bca71e36ac5357acc9c349bf8e4f6 /kernel-x86_64-fedora.config | |
| parent | 8f3f0017691ec9ec0adb94b92084fc1f402df95c (diff) | |
| parent | 58f461d452ca71855ab4a53cf6d36eb8ab1a818f (diff) | |
| download | kernel-7fab7d503cf3c9388db6779c203de2670789da4a.tar.gz kernel-7fab7d503cf3c9388db6779c203de2670789da4a.tar.xz kernel-7fab7d503cf3c9388db6779c203de2670789da4a.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc1.20210713git7fef2edf7cc7.18.vanilla.1.fc35
Diffstat (limited to 'kernel-x86_64-fedora.config')
| -rw-r--r-- | kernel-x86_64-fedora.config | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 280249bb0..5d81c9d3d 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -243,7 +243,7 @@ CONFIG_AMD_SFH_HID=m # CONFIG_AMDTEE is not set CONFIG_AMD_XGBE_DCB=y CONFIG_AMD_XGBE=m -CONFIG_AMIGA_PARTITION=y +# CONFIG_AMIGA_PARTITION is not set CONFIG_AMILO_RFKILL=m # CONFIG_ANDROID is not set # CONFIG_APDS9300 is not set @@ -3065,7 +3065,7 @@ CONFIG_JOYSTICK_ZHENHUA=m CONFIG_JUMP_LABEL=y CONFIG_KALLSYMS_ALL=y CONFIG_KALLSYMS=y -CONFIG_KARMA_PARTITION=y +# CONFIG_KARMA_PARTITION is not set # CONFIG_KASAN is not set # CONFIG_KASAN_MODULE_TEST is not set # CONFIG_KASAN_VMALLOC is not set @@ -6593,10 +6593,10 @@ CONFIG_TCG_ATMEL=m CONFIG_TCG_CRB=y CONFIG_TCG_INFINEON=m CONFIG_TCG_NSC=m -# CONFIG_TCG_TIS_I2C_ATMEL is not set +CONFIG_TCG_TIS_I2C_ATMEL=m # CONFIG_TCG_TIS_I2C_CR50 is not set -# CONFIG_TCG_TIS_I2C_INFINEON is not set -# CONFIG_TCG_TIS_I2C_NUVOTON is not set +CONFIG_TCG_TIS_I2C_INFINEON=m +CONFIG_TCG_TIS_I2C_NUVOTON=m CONFIG_TCG_TIS_SPI_CR50=y CONFIG_TCG_TIS_SPI=m # CONFIG_TCG_TIS_ST33ZP24_I2C is not set |