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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[sfrench/cifs-2.6.git]
/
arch
/
s390
/
defconfig
diff --git
a/arch/s390/defconfig
b/arch/s390/defconfig
index d00e368fb5e6ef949b6fb070321fa3a6dc9c8501..68bfd09f1b02ec23dad7ba4931db828f1286d890 100644
(file)
--- a/
arch/s390/defconfig
+++ b/
arch/s390/defconfig
@@
-229,6
+229,7
@@
CONFIG_CRYPTO_USER_API_HASH=m
CONFIG_CRYPTO_USER_API_SKCIPHER=m
CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_ZCRYPT=m
+CONFIG_PKEY=m
CONFIG_CRYPTO_SHA1_S390=m
CONFIG_CRYPTO_SHA256_S390=m
CONFIG_CRYPTO_SHA512_S390=m