diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-10-22 14:19:57 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-10-22 14:19:57 +0400 |
| commit | 930352862e9533fecc42c7ed20798a7c9e3aa874 (patch) | |
| tree | f234d6eb69c077f898e375aef30c9550dcf069d7 /fs/nfs/idmap.c | |
| parent | b46882b6eb713245916100ac5b58664cd242a08d (diff) | |
| parent | 7bbd03e0143b562ff7d96f7e71c016104020b550 (diff) | |
| download | linux-930352862e9533fecc42c7ed20798a7c9e3aa874.tar.xz | |
Merge branch 'topic/enum-info-cleanup' into for-next
this is a series of patches to just convert the plain info callback
for enum ctl elements to snd_ctl_elem_info(). Also, it includes the
extension of snd_ctl_elem_info(), for catching the unexpected string
cut-off and handling the zero items.
Diffstat (limited to 'fs/nfs/idmap.c')
| -rw-r--r-- | fs/nfs/idmap.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/idmap.c b/fs/nfs/idmap.c index 7dd55b745c4d..2f5db844c172 100644 --- a/fs/nfs/idmap.c +++ b/fs/nfs/idmap.c @@ -177,7 +177,6 @@ static struct key_type key_type_id_resolver = { .preparse = user_preparse, .free_preparse = user_free_preparse, .instantiate = generic_key_instantiate, - .match = user_match, .revoke = user_revoke, .destroy = user_destroy, .describe = user_describe, @@ -401,7 +400,6 @@ static struct key_type key_type_id_resolver_legacy = { .preparse = user_preparse, .free_preparse = user_free_preparse, .instantiate = generic_key_instantiate, - .match = user_match, .revoke = user_revoke, .destroy = user_destroy, .describe = user_describe, |