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 branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
[sfrench/cifs-2.6.git]
/
arch
/
s390
/
defconfig
diff --git
a/arch/s390/defconfig
b/arch/s390/defconfig
index 20add000dd6d600b3baccd5656d78e8f188b3991..7cb6a52f727dafc6c994423b0db21ccafec4993a 100644
(file)
--- a/
arch/s390/defconfig
+++ b/
arch/s390/defconfig
@@
-221,7
+221,6
@@
CONFIG_CRYPTO_SALSA20=m
CONFIG_CRYPTO_SEED=m
CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_SM4=m
-CONFIG_CRYPTO_SPECK=m
CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TWOFISH=m
CONFIG_CRYPTO_DEFLATE=m