diff --git a/[refs] b/[refs] index be8f43221c1a..84958d57f439 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: beb0f0a9fba1fa98b378329a9a5b0a73f25097ae +refs/heads/master: 5f3e97c9ee6290befb5a2e78baf95ff951a8a34a diff --git a/trunk/fs/nfs/idmap.c b/trunk/fs/nfs/idmap.c index 4e2d9b6b1380..18696882f1c6 100644 --- a/trunk/fs/nfs/idmap.c +++ b/trunk/fs/nfs/idmap.c @@ -238,7 +238,7 @@ int nfs_map_gid_to_group(struct nfs_client *clp, __u32 gid, char *buf, size_t bu return nfs_idmap_lookup_name(gid, "group", buf, buflen); } -#else /* CONFIG_NFS_USE_IDMAPPER not defined */ +#else /* CONFIG_NFS_USE_NEW_IDMAPPER not defined */ #include #include