Merge branch 'master' into for-next

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

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 259dea9c6dff4c1c83880cfc60c504b84130cfdf..ae9c3ceb2867a8e15700a539ec8d3bd0f1ce1e75 100644 (file)
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -102,8 +102,8 @@ config CRYPTO_MANAGER2
 
 config CRYPTO_USER
        tristate "Userspace cryptographic algorithm configuration"
+       depends on NET
        select CRYPTO_MANAGER
-       select NET
        help
          Userapace configuration for cryptographic instantiations such as
          cbc(aes).
@@ -329,7 +329,6 @@ config CRYPTO_CRC32C_INTEL
 
 config CRYPTO_GHASH
        tristate "GHASH digest algorithm"
-       select CRYPTO_SHASH
        select CRYPTO_GF128MUL
        help
          GHASH is message digest algorithm for GCM (Galois/Counter Mode).
@@ -477,7 +476,6 @@ config CRYPTO_WP512
 config CRYPTO_GHASH_CLMUL_NI_INTEL
        tristate "GHASH digest algorithm (CLMUL-NI accelerated)"
        depends on X86 && 64BIT
-       select CRYPTO_SHASH
        select CRYPTO_CRYPTD
        help
          GHASH is message digest algorithm for GCM (Galois/Counter Mode).