diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-10-09 19:50:57 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-10-09 19:50:57 +0200 |
commit | f248584f0cf6da8b060cd9f84b13d3d807b01699 (patch) | |
tree | e9be07c2f06c7a97e3ad86b709a4db6335ce5556 /kernel-x86_64-debug.config | |
parent | 8ab9431272717b54609f7f93d9e507eab417a95b (diff) | |
parent | bc12ea1f584ee1ecb441db52b5c0e4c7771bf4ba (diff) | |
download | kernel-f248584f0cf6da8b060cd9f84b13d3d807b01699.tar.gz kernel-f248584f0cf6da8b060cd9f84b13d3d807b01699.tar.xz kernel-f248584f0cf6da8b060cd9f84b13d3d807b01699.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc4.git0.1.vanilla.knurd.1.fc28kernel-4.14.0-0.rc4.git0.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc4.git0.1.vanilla.knurd.1.fc26kernel-4.14.0-0.rc4.git0.1.vanilla.knurd.1.fc25
Diffstat (limited to 'kernel-x86_64-debug.config')
-rw-r--r-- | kernel-x86_64-debug.config | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index a51eac9b6..34dd6902c 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -1915,7 +1915,6 @@ CONFIG_HWMON=y CONFIG_HWPOISON_INJECT=m CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_INTEL=m -CONFIG_HW_RANDOM_OMAP=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=m CONFIG_HW_RANDOM_VIA=m |