diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-09-22 22:54:56 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-09-22 22:54:56 +1000 |
| commit | 35e1efd25a9e7d5cf2884fa23441ab87353849bb (patch) | |
| tree | aa0e546b39fa4d0a434919ff106721dfc3777a3d /security/keys/encrypted-keys/encrypted.c | |
| parent | 6f98e892884c32b9273ecce1332b849bcad3b8b1 (diff) | |
| parent | d1ac5540455c3a2a11e943e19e2dc044cebe147d (diff) | |
Merge tag 'keys-next-20140922' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'security/keys/encrypted-keys/encrypted.c')
| -rw-r--r-- | security/keys/encrypted-keys/encrypted.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c index 5fe443d120af..db9675db1026 100644 --- a/security/keys/encrypted-keys/encrypted.c +++ b/security/keys/encrypted-keys/encrypted.c @@ -970,7 +970,6 @@ struct key_type key_type_encrypted = { .name = "encrypted", .instantiate = encrypted_instantiate, .update = encrypted_update, - .match = user_match, .destroy = encrypted_destroy, .describe = user_describe, .read = encrypted_read, |