git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'm68k-for-v4.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
m68k
/
configs
/
amiga_defconfig
diff --git
a/arch/m68k/configs/amiga_defconfig
b/arch/m68k/configs/amiga_defconfig
index 93a3c3c0238ce7ae86faeeae72134cede914b6b6..85904b73e261c53af6fe66bcc3b5b54012e02d42 100644
(file)
--- a/
arch/m68k/configs/amiga_defconfig
+++ b/
arch/m68k/configs/amiga_defconfig
@@
-621,7
+621,6
@@
CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_USER=m
CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_MCRYPTD=m
CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_CHACHA20POLY1305=m
CONFIG_CRYPTO_AEGIS128=m