diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 15:41:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-21 15:41:17 -0400 |
| commit | e60b9a0346ee08af4715ee5b2d82f705fbe6e309 (patch) | |
| tree | 886e1be2a283806e1dc940b7379a5a6e4683a97b /drivers/crypto | |
| parent | 9daeaa370526df1c19eba4780247bb7155541e38 (diff) | |
| parent | a7475afd530e6bf81c9025b0134dd1c7c6f1a219 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 updates from Martin Schwidefsky:
"Just a random collection of bug-fixes and cleanups, nothing new in
this merge request."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (46 commits)
s390/ap: Fix wrong or missing comments
s390/ap: move receive callback to message struct
s390/dasd: re-prioritize partition detection message
s390/qeth: reshuffle initialization
s390/qeth: cleanup drv attr usage
s390/claw: cleanup drv attr usage
s390/lcs: cleanup drv attr usage
s390/ctc: cleanup drv attr usage
s390/ccwgroup: remove ccwgroup_create_from_string
s390/qeth: stop using struct ccwgroup driver for discipline callbacks
s390/qeth: switch to ccwgroup_create_dev
s390/claw: switch to ccwgroup_create_dev
s390/lcs: switch to ccwgroup_create_dev
s390/ctcm: switch to ccwgroup_create_dev
s390/ccwgroup: exploit ccwdev_by_dev_id
s390/ccwgroup: introduce ccwgroup_create_dev
s390: fix race on TIF_MCCK_PENDING
s390/barrier: make use of fast-bcr facility
s390/barrier: cleanup barrier functions
s390/claw: remove "eieio" calls
...
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index dd414d9350ef..371f13cc38eb 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig | |||
| @@ -111,6 +111,7 @@ config CRYPTO_DES_S390 | |||
| 111 | depends on S390 | 111 | depends on S390 |
| 112 | select CRYPTO_ALGAPI | 112 | select CRYPTO_ALGAPI |
| 113 | select CRYPTO_BLKCIPHER | 113 | select CRYPTO_BLKCIPHER |
| 114 | select CRYPTO_DES | ||
| 114 | help | 115 | help |
| 115 | This is the s390 hardware accelerated implementation of the | 116 | This is the s390 hardware accelerated implementation of the |
| 116 | DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3). | 117 | DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3). |