diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2006-01-06 03:19:28 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:53 -0500 |
| commit | 347a8dc3b815f0c0fa62a1df075184ffe4cbdcf1 (patch) | |
| tree | a6ec76690127e87fe6efa42b6238caadd6c07e7b /crypto | |
| parent | 9bbc8346fb21fad3f678220b067450e436e45dbf (diff) | |
[PATCH] s390: cleanup Kconfig
Sanitize some s390 Kconfig options. We have ARCH_S390, ARCH_S390X,
ARCH_S390_31, 64BIT, S390_SUPPORT and COMPAT. Replace these 6 options by
S390, 64BIT and COMPAT.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index c696f7ab729e..52e1d4108a99 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
| @@ -42,7 +42,7 @@ config CRYPTO_SHA1 | |||
| 42 | 42 | ||
| 43 | config CRYPTO_SHA1_S390 | 43 | config CRYPTO_SHA1_S390 |
| 44 | tristate "SHA1 digest algorithm (s390)" | 44 | tristate "SHA1 digest algorithm (s390)" |
| 45 | depends on CRYPTO && ARCH_S390 | 45 | depends on CRYPTO && S390 |
| 46 | help | 46 | help |
| 47 | This is the s390 hardware accelerated implementation of the | 47 | This is the s390 hardware accelerated implementation of the |
| 48 | SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2). | 48 | SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2). |
| @@ -58,7 +58,7 @@ config CRYPTO_SHA256 | |||
| 58 | 58 | ||
| 59 | config CRYPTO_SHA256_S390 | 59 | config CRYPTO_SHA256_S390 |
| 60 | tristate "SHA256 digest algorithm (s390)" | 60 | tristate "SHA256 digest algorithm (s390)" |
| 61 | depends on CRYPTO && ARCH_S390 | 61 | depends on CRYPTO && S390 |
| 62 | help | 62 | help |
| 63 | This is the s390 hardware accelerated implementation of the | 63 | This is the s390 hardware accelerated implementation of the |
| 64 | SHA256 secure hash standard (DFIPS 180-2). | 64 | SHA256 secure hash standard (DFIPS 180-2). |
| @@ -111,7 +111,7 @@ config CRYPTO_DES | |||
| 111 | 111 | ||
| 112 | config CRYPTO_DES_S390 | 112 | config CRYPTO_DES_S390 |
| 113 | tristate "DES and Triple DES cipher algorithms (s390)" | 113 | tristate "DES and Triple DES cipher algorithms (s390)" |
| 114 | depends on CRYPTO && ARCH_S390 | 114 | depends on CRYPTO && S390 |
| 115 | help | 115 | help |
| 116 | DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3). | 116 | DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3). |
| 117 | 117 | ||
| @@ -217,7 +217,7 @@ config CRYPTO_AES_X86_64 | |||
| 217 | 217 | ||
| 218 | config CRYPTO_AES_S390 | 218 | config CRYPTO_AES_S390 |
| 219 | tristate "AES cipher algorithms (s390)" | 219 | tristate "AES cipher algorithms (s390)" |
| 220 | depends on CRYPTO && ARCH_S390 | 220 | depends on CRYPTO && S390 |
| 221 | help | 221 | help |
| 222 | This is the s390 hardware accelerated implementation of the | 222 | This is the s390 hardware accelerated implementation of the |
| 223 | AES cipher algorithms (FIPS-197). AES uses the Rijndael | 223 | AES cipher algorithms (FIPS-197). AES uses the Rijndael |
