diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2024-03-22 02:14:13 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-03-22 02:15:08 +0300 |
| commit | 537c2e91d3549e5d6020bb0576cf9b54a845255f (patch) | |
| tree | c09e8a1b7d733cde19b0c72678c28fb2bc97ff6b /drivers/crypto/Kconfig | |
| parent | 237bb5f7f7f55ec5f773469a974c61a49c298625 (diff) | |
| parent | cba9ffdb9913dfe6be29f049ce920ce451ce7cc4 (diff) | |
| download | linux-537c2e91d3549e5d6020bb0576cf9b54a845255f.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/crypto/Kconfig')
| -rw-r--r-- | drivers/crypto/Kconfig | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index 0991f026cb07..3d02702456a5 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig @@ -611,13 +611,13 @@ config CRYPTO_DEV_QCOM_RNG To compile this driver as a module, choose M here. The module will be called qcom-rng. If unsure, say N. -config CRYPTO_DEV_VMX - bool "Support for VMX cryptographic acceleration instructions" - depends on PPC64 && VSX - help - Support for VMX cryptographic acceleration instructions. - -source "drivers/crypto/vmx/Kconfig" +#config CRYPTO_DEV_VMX +# bool "Support for VMX cryptographic acceleration instructions" +# depends on PPC64 && VSX +# help +# Support for VMX cryptographic acceleration instructions. +# +#source "drivers/crypto/vmx/Kconfig" config CRYPTO_DEV_IMGTEC_HASH tristate "Imagination Technologies hardware hash accelerator" |