diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-25 20:15:23 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-25 20:15:23 -0500 |
| commit | 50d9a126240f9961cfdd063336bbeb91f77a7dce (patch) | |
| tree | 7e9c306cc49ad11e9e23cd4616591f323d9ff5cc /drivers/crypto/Kconfig | |
| parent | 29bd17af7d8ffc16bb5eb286947495c166ea826e (diff) | |
| parent | 946fef4e14ebc2f14ab05f54789843621fe87f60 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
[CRYPTO] hifn795x: Disallow built-in hifn795x when HW_RANDOM is m
Diffstat (limited to 'drivers/crypto/Kconfig')
| -rw-r--r-- | drivers/crypto/Kconfig | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 74bd599dfb0c..8a70a9edabda 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig | |||
| @@ -88,10 +88,16 @@ config CRYPTO_DEV_HIFN_795X | |||
| 88 | select CRYPTO_DES | 88 | select CRYPTO_DES |
| 89 | select CRYPTO_ALGAPI | 89 | select CRYPTO_ALGAPI |
| 90 | select CRYPTO_BLKCIPHER | 90 | select CRYPTO_BLKCIPHER |
| 91 | select HW_RANDOM if CRYPTO_DEV_HIFN_795X_RNG | ||
| 91 | depends on PCI | 92 | depends on PCI |
| 92 | help | 93 | help |
| 93 | This option allows you to have support for HIFN 795x crypto adapters. | 94 | This option allows you to have support for HIFN 795x crypto adapters. |
| 94 | 95 | ||
| 95 | 96 | config CRYPTO_DEV_HIFN_795X_RNG | |
| 97 | bool "HIFN 795x random number generator" | ||
| 98 | depends on CRYPTO_DEV_HIFN_795X | ||
| 99 | help | ||
| 100 | Select this option if you want to enable the random number generator | ||
| 101 | on the HIFN 795x crypto adapters. | ||
| 96 | 102 | ||
| 97 | endif # CRYPTO_HW | 103 | endif # CRYPTO_HW |