phylib: Add Marvell 88E1112 phy id

[firefly-linux-kernel-4.4.55.git] / drivers / crypto / Kconfig

diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index f21fe66c9eefd4590adc9ee2b9dc63bd6ead0493..bb90cbd7ca51ce87d9d979993d1ae5ce6c0bda61 100644 (file)
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -1,10 +1,10 @@
 menu "Hardware crypto devices"
 
 config CRYPTO_DEV_PADLOCK
-       bool "Support for VIA PadLock ACE"
+       tristate "Support for VIA PadLock ACE"
        depends on X86_32
        select CRYPTO_ALGAPI
-       default y
+       default m
        help
          Some VIA processors come with an integrated crypto engine
          (so called VIA PadLock ACE, Advanced Cryptography Engine)
@@ -51,9 +51,31 @@ config CRYPTO_DEV_GEODE
        default m
        help
          Say 'Y' here to use the AMD Geode LX processor on-board AES
-         engine for the CryptoAPI AES alogrithm.
+         engine for the CryptoAPI AES algorithm.
 
          To compile this driver as a module, choose M here: the module
          will be called geode-aes.
 
+config ZCRYPT
+       tristate "Support for PCI-attached cryptographic adapters"
+       depends on S390
+       select ZCRYPT_MONOLITHIC if ZCRYPT="y"
+       default "m"
+       help
+         Select this option if you want to use a PCI-attached cryptographic
+         adapter like:
+         + PCI Cryptographic Accelerator (PCICA)
+         + PCI Cryptographic Coprocessor (PCICC)
+         + PCI-X Cryptographic Coprocessor (PCIXCC)
+         + Crypto Express2 Coprocessor (CEX2C)
+         + Crypto Express2 Accelerator (CEX2A)
+
+config ZCRYPT_MONOLITHIC
+       bool "Monolithic zcrypt module"
+       depends on ZCRYPT="m"
+       help
+         Select this option if you want to have a single module z90crypt.ko
+         that contains all parts of the crypto device driver (ap bus,
+         request router and all the card drivers).
+
 endmenu