diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-04-07 01:52:57 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-04-07 01:52:57 +0530 |
| commit | 97caf63d0c837f9b5c9f6f469979e68c0378e83f (patch) | |
| tree | c6fc834bcfb66268f474324eca619db419010532 /drivers/crypto/Kconfig | |
| parent | 6a1a6f4f69adf0febfd923795b45edeff63e75ed (diff) | |
Merge branch '3.4-rc1' into android-tegra-nv-3.3-rebased
Change-Id: Ib3b69ffc5ac3e07c9cc44cc49e9142088eec477e
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'drivers/crypto/Kconfig')
| -rw-r--r-- | drivers/crypto/Kconfig | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 0fc4e6fab404..65dec5463f1f 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -64,7 +64,6 @@ config CRYPTO_DEV_GEODE config ZCRYPT tristate "Support for PCI-attached cryptographic adapters" depends on S390 - select ZCRYPT_MONOLITHIC if ZCRYPT="y" select HW_RANDOM help Select this option if you want to use a PCI-attached cryptographic @@ -77,14 +76,6 @@ config ZCRYPT + Crypto Express3 Coprocessor (CEX3C) + Crypto Express3 Accelerator (CEX3A) -config ZCRYPT_MONOLITHIC - bool "Monolithic zcrypt module" - depends on ZCRYPT - help - Select this option if you want to have a single module z90crypt, - that contains all parts of the crypto device driver (ap bus, - request router and all the card drivers). - config CRYPTO_SHA1_S390 tristate "SHA1 digest algorithm" depends on S390 @@ -295,12 +286,14 @@ config CRYPTO_DEV_S5P config CRYPTO_DEV_TEGRA_AES tristate "Support for TEGRA AES hw engine" - depends on ARCH_TEGRA_2x_SOC || ARCH_TEGRA_3x_SOC + depends on ARCH_TEGRA select CRYPTO_AES select TEGRA_ARB_SEMAPHORE help TEGRA processors have AES module accelerator. Select this if you want to use the TEGRA module for AES algorithms. + To compile this driver as a module, choose M here: the module + will be called tegra-aes. config CRYPTO_DEV_TEGRA_SE tristate "Tegra SE driver for crypto algorithms" |