diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2008-01-25 17:48:44 -0500 |
---|---|---|
committer | Herbert Xu <herbert@gondor.apana.org.au> | 2008-01-25 17:48:44 -0500 |
commit | 946fef4e14ebc2f14ab05f54789843621fe87f60 (patch) | |
tree | f883bbadbac017ac46e00d8da528b50b78c1318d /drivers/crypto/Kconfig | |
parent | 2d94dfc8c38edf63e91e48fd55c3a8822b6a9ced (diff) |
[CRYPTO] hifn795x: Disallow built-in hifn795x when HW_RANDOM is m
Currently it is possible to select HW_RANDOM as a module and have
hifn795x built-in. This causes a build problem because hifn795x
will then call hwrng_register which isn't built-in.
This patch introduces a new config option to control the hifn795x
RNG which lets us avoid this problem.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
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 |