Merge commit 'v3.17' into next

[firefly-linux-kernel-4.4.55.git] / crypto / asymmetric_keys / pkcs7_key_type.c

diff --git a/crypto/asymmetric_keys/pkcs7_key_type.c b/crypto/asymmetric_keys/pkcs7_key_type.c
index d1faa1df1decdd24396d1be7fe507c64a1dcc7e4..751f8fd7335db2203f7257edc8ad680dc7ea2a14 100644 (file)
--- a/crypto/asymmetric_keys/pkcs7_key_type.c
+++ b/crypto/asymmetric_keys/pkcs7_key_type.c
@@ -75,7 +75,6 @@ static struct key_type key_type_pkcs7 = {
        .preparse               = pkcs7_preparse,
        .free_preparse          = user_free_preparse,
        .instantiate            = generic_key_instantiate,
-       .match                  = user_match,
        .revoke                 = user_revoke,
        .destroy                = user_destroy,
        .describe               = user_describe,