diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-10-31 19:56:12 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-10-31 19:56:12 +0100 |
| commit | a59d2a403d404c335e5eae4cadcb7f35bdedf492 (patch) | |
| tree | 5275caaf98ca42a1711cb806c62d14d3464afe17 /kernel-x86_64.config | |
| parent | 7158faaa9bb114d4c7573eb3e529da4f0156a5f1 (diff) | |
| parent | bf0b23e3a4943c10e28b2f40cbfef0a1c278d0f6 (diff) | |
| download | kernel-a59d2a403d404c335e5eae4cadcb7f35bdedf492.tar.gz kernel-a59d2a403d404c335e5eae4cadcb7f35bdedf492.tar.xz kernel-a59d2a403d404c335e5eae4cadcb7f35bdedf492.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.20.0-0.rc0.git7.1.vanilla.knurd.1.fc30kernel-4.20.0-0.rc0.git7.1.vanilla.knurd.1.fc29kernel-4.20.0-0.rc0.git7.1.vanilla.knurd.1.fc28kernel-4.20.0-0.rc0.git7.1.vanilla.knurd.1.fc27
Diffstat (limited to 'kernel-x86_64.config')
| -rw-r--r-- | kernel-x86_64.config | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 9197d6005..c362c4a4f 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -498,7 +498,6 @@ CONFIG_BLK_DEV_BSG=y # CONFIG_BLK_DEV_CS5520 is not set # CONFIG_BLK_DEV_CS5530 is not set # CONFIG_BLK_DEV_CS5535 is not set -CONFIG_BLK_DEV_DAC960=m CONFIG_BLK_DEV_DM=y CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_FD=m @@ -1071,7 +1070,6 @@ CONFIG_CRYPTO_SIMD=y # CONFIG_CRYPTO_SKEIN is not set CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM4=m -# CONFIG_CRYPTO_SPECK is not set CONFIG_CRYPTO_STATS=y CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEST=m @@ -4429,7 +4427,7 @@ CONFIG_PROC_EVENTS=y CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_PROC_PID_CPUSET=y -# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set +CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y |